[MERGE] Bug 303455: orm.create() - use local before inherited, courtesy of Thibaut DIRLIK (Logica)

bzr revid: odo@openerp.com-20111201121503-bf7671is06atteb4
2011-12-01 13:15:03 +01:00
parent 84004e8923 0a6bbc3769
commit 7fa02d56b2
1 changed files with 1 additions and 1 deletions
@@ -4026,7 +4026,7 @@ class BaseModel(object):
        upd_todo = []
        unknown_fields = []
        for v in vals.keys():
-            if v in self._inherit_fields:
+            if v in self._inherit_fields and v not in self._columns:
                (table, col, col_detail, original_parent) = self._inherit_fields[v]
                tocreate[table][v] = vals[v]
                del vals[v]