From 6ad9294df0ef98f17d59ca9e75cdcbae01b1da9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 9 Apr 2008 10:47:46 +0200 Subject: [PATCH] Fix default value for property inherited --- trytond/osv/orm.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/trytond/osv/orm.py b/trytond/osv/orm.py index 0fe942f91a..4c2f7fa265 100644 --- a/trytond/osv/orm.py +++ b/trytond/osv/orm.py @@ -1187,14 +1187,11 @@ class ORM(object): for field in fields_names: if field in self._defaults: value[field] = self._defaults[field](cursor, user, context) - fld_def = ((field in self._columns) and self._columns[field]) \ - or ((field in self._inherit_fields) \ - and self._inherit_fields[field][2]) \ - or False - if isinstance(fld_def, fields.Property): - property_obj = self.pool.get('ir.property') - value[field] = property_obj.get(cursor, user, field, - self._name) + if field in self._columns: + if isinstance(self._columns[field], fields.Property): + property_obj = self.pool.get('ir.property') + value[field] = property_obj.get(cursor, user, field, + self._name) # get the default values set by the user and override the default # values defined in the object