From b89264ab8bc30490fb5e2186a65e4e61bcf33ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 25 Jan 2009 01:36:25 +0100 Subject: [PATCH] Use default value from base model before of inherit model for xml import --- trytond/tools/convert.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/trytond/tools/convert.py b/trytond/tools/convert.py index a0b1f4541d..d6a1680d3e 100644 --- a/trytond/tools/convert.py +++ b/trytond/tools/convert.py @@ -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]