Merge lp:~unifield-team/unifield-server/fix_osv_memory_fields_function_multi into lp:unifield-server

[Quentin THEURET @Amaris]

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2011-07-26 16:02:06 +0000
+++ bin/osv/orm.py	2011-08-18 14:51:36 +0000
@@ -1967,6 +1967,33 @@
                 res2 = self._columns[f].get_memory(cr, self, ids, f, user, context=context, values=result)
                 for record in result:
                     record[f] = res2[record['id']]
+            
+            # all non inherited fields for which the attribute whose name is in load is False
+            fields_post = filter(lambda x: x in self._columns and not getattr(self._columns[x], load), fields_to_read)
+    
+            # Compute POST fields
+            todo = {}
+            for f in fields_post:
+                todo.setdefault(self._columns[f]._multi, [])
+                todo[self._columns[f]._multi].append(f)
+            for key, val in todo.items():
+                if key:
+                    res2 = self._columns[val[0]].get_memory(cr, self, ids, val, user, context=context, values=result)
+                    for pos in val:
+                        for record in result:
+                            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 multi_fields:
+                                record[pos] = multi_fields.get(pos,[])
+                else:
+                    for f in val:
+                        res2 = self._columns[f].get_memory(cr, self, ids, f, user, context=context, values=result)
+                        for record in result:
+                            if res2:
+                                record[f] = res2[record['id']]
+                            else:
+                                record[f] = []
+                    
             if isinstance(ids_orig, (int, long)):
                 return result[0]
         return result