[FIX] orm: correct computation of parent_store for specific cases with duplicate...

bzr revid: odo@openerp.com-20100623154737-7qnrxia2a7o56fzf

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 8351cc4..ff04a6b 100644 (file)
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -3138,6 +3138,11 @@ class orm(orm_template):
 
         del data['id']
 
+        # make sure we don't break the current parent_store structure and
+        # force a clean recompute!
+        for parent_column in ['parent_left', 'parent_right']:
+            data.pop(parent_column, None)
+
         for v in self._inherits:
             del data[self._inherits[v]]
         return data, [] # keep empty second argument for backwards compatibility, removed in 6.0