Merge lp:~openerp-dev/openobject-server/6.0-bug-745679-xrg into lp:openobject-server/6.0

[xrg]

[Vo Minh Thu (thu)]

Thanks for the patch.

Actually if res2 is None, we should throw a nice exception saying that a particular function field doesn't return the expected result type.

So in the case of the linked bug report, it is really a bug in account.account, not in the orm.

I will reject this patch.

Unmerged revisions

3387. By xrg on 2011-04-01

ORM: fix function field computation when records are missing

[Bug 745679], reported by: Marco Dieckhoff

When the get() method of some function field fails to return data (in
our case, because active=False prevents search()ing some accounts),
that part of logic for function fields was broken.

Still, we have to decide if missing that data shall be tolerated.

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2011-03-23 19:20:43 +0000
+++ bin/osv/orm.py	2011-04-01 09:48:49 +0000
@@ -3049,10 +3049,19 @@
         for key, val in todo.items():
             if key:
                 res2 = self._columns[val[0]].get(cr, self, ids, val, user, context=context, values=res)
+                if not res2:
+                    logging.getLogger('orm').warning("%s.%s didn't provide us data for %s",
+                                    self._name, val[0], get_ids)
+                    res2 = {}
                 for pos in val:
                     for record in res:
-                        if isinstance(res2[record['id']], str): res2[record['id']] = eval(res2[record['id']]) #TOCHECK : why got string instend of dict in python2.6
-                        multi_fields = res2.get(record['id'],{})
+                        if not (record['id'] in res2):
+                            # Is it right not to have that?
+                            continue
+                        if isinstance(res2[record['id']], str):
+                            res2[record['id']] = eval(res2[record['id']])
+                            #TOCHECK : why got string instend of dict in python2.6
+                        multi_fields = res2[record['id']]
                         if multi_fields:
                             record[pos] = multi_fields.get(pos,[])
             else: