diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2010-06-16 13:34:27 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2010-06-16 13:34:27 +0200 |
| commit | ebb2a2b3645340d8dc4ddda422d3f268ba96370b (patch) | |
| tree | 2c090cfe4fb1571051073a07c479e21e94a55828 /bin | |
| parent | dbec8b87aac2eeec7f54b54b81ccbe23bf78567b (diff) | |
bugfix
bzr revid: fp@tinyerp.com-20100616113427-3xzh1hn1xho0ieus
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/addons/base/base_update.xml | 2 | ||||
| -rw-r--r-- | bin/osv/orm.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml index 2e135dfc001..7823aca8f18 100644 --- a/bin/addons/base/base_update.xml +++ b/bin/addons/base/base_update.xml @@ -80,6 +80,7 @@ <page string="Current Activity"> <field name="company_id" widget="selection" readonly="0" context="{'user_id': self, 'user_preference': 1}"/> + <field name="view" readonly="0"/> <newline/> <separator colspan="4" string="Preferences"/> </page> @@ -90,7 +91,6 @@ <label colspan="3" string="Please note that you will have to logout and relog if you change your password."/> <field name="context_lang" completion="1" readonly="0"/> <field name="context_tz" completion="1" readonly="0"/> - <field name="view" readonly="0"/> <newline/> <separator string="Signature" colspan="4"/> <field colspan="4" name="signature" readonly="0" nolabel="1"/> diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 9798e72ece7..265382407b1 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -2616,6 +2616,7 @@ class orm(orm_template): fld_def = ((f in self._columns) and self._columns[f]) \ or ((f in self._inherit_fields) and self._inherit_fields[f][2]) \ or False + if isinstance(fld_def, fields.property): property_obj = self.pool.get('ir.property') prop_value = property_obj.get(cr, uid, f, self._name, context=context) @@ -2625,7 +2626,8 @@ class orm(orm_template): else: value[f] = prop_value else: - value[f] = False + if f not in value: + value[f] = False # get the default values set by the user and override the default # values defined in the object |