Merge lp:~unifield-team/unifield-wm/sync-uf-2087-second-version into lp:unifield-wm/sync

[Quentin THEURET @Amaris]

Unmerged revisions

339. By Quentin THEURET @Amaris on 2013-07-11

UF-2087 [FIX] Fix missing columns when filter o2m in sync. engine

338. By Quentin THEURET @Amaris on 2013-07-11

UF-2087 [FIX] Fix missing columns when filter o2m in sync. engine

=== modified file 'sync_client/orm.py'
--- sync_client/orm.py	2013-07-10 14:34:06 +0000
+++ sync_client/orm.py	2013-07-11 10:27:33 +0000
@@ -331,9 +331,19 @@
             synchronized_ids.extend(data_ids)
 
         def filter_o2m(field_list):
-            return [(f, self._columns[f])
-                    for f in field_list
-                    if isinstance(self._columns[f], fields.one2many)]
+            res = []
+            for f in field_list:
+                if f not in self._columns and \
+                   f in self._inherit_fields and \
+                   isinstance(self._inherit_fields[f][2], fields.one2many):
+                    res.append((f, self._inherit_fields[f][2]))
+                elif f in self._columns and isinstance(self._columns[f], fields.one2many):
+                    res.append((f, self._columns[f]))
+
+            return res
+#            return [(f, self._columns[f])
+#                        for f in field_list 
+#                        if f in self._columns and isinstance(self._columns[f], fields.one2many)]
 
         if previous_values is None:
             whole_fields = self._columns.keys()