Use default value from base model before of inherit model for xml import

This commit is contained in:
Cédric Krier
2009-01-25 01:36:25 +01:00
parent e803fa7461
commit b89264ab8b
+5 -5
View File
@@ -683,13 +683,13 @@ class TrytondXmlHandler(sax.handler.ContentHandler):
# we cannot update a field if it was changed by a user...
if key not in old_values:
if key in object_ref._inherit_fields:
parent_obj = self.pool.get(
object_ref._inherit_fields[key][0])
expected_value = parent_obj._defaults.get(
if key in object_ref._columns:
expected_value = object_ref._defaults.get(
key, lambda *a: None)(cursor, user)
else:
expected_value = object_ref._defaults.get(
inherit_obj = self.pool.get(
object_ref._inherit_fields[key][0])
expected_value = inherit_obj._defaults.get(
key, lambda *a: None)(cursor, user)
else:
expected_value = old_values[key]