merge

bzr revid: fp@tinyerp.com-20081027115900-21mykbjk7whhq7in
2008-10-27 12:59:00 +01:00
parent 54f4c8f1cc
commit 96e69a0a25
1 changed files with 4 additions and 1 deletions
@@ -2325,7 +2325,10 @@ class orm(orm_template):
                        continue
                    value = res[field]
                    if self._columns[field]._type in ('many2one', 'one2one'):
-                        value = res[field][0]
+                        try:
+                            value = res[field][0]
+                        except:
+                            value = res[field]
                    upd0.append('"'+field+'"='+self._columns[field]._symbol_set[0])
                    upd1.append(self._columns[field]._symbol_set[1](value))
                upd1.append(res['id'])