diff options
| author | Olivier Dony <odo@openerp.com> | 2011-01-28 17:03:22 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-01-28 17:03:22 +0100 |
| commit | 880b89a34390e726cab48879682e8e9df480a6aa (patch) | |
| tree | b40bf84b1cf1eca5c5ff1c16226e4365c2bb9f3d /bin | |
| parent | 828481bc6a41f56fd5eb68385eef72239fbb573d (diff) | |
[FIX] orm: incorrect braces when processing default values for o2m/m2m
lp bug: https://launchpad.net/bugs/704311 fixed
bzr revid: odo@openerp.com-20110128160322-loi7i2te6d1rsn6p
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/osv/orm.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 89b93c41923..57ea350e47b 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -1867,12 +1867,12 @@ class orm_template(object): # override defaults with the provided values, never allow the other way around defaults = self.default_get(cr, uid, missing_defaults, context) for dv in defaults: - if (dv in self._columns and self._columns[dv]._type == 'many2many') \ - or (dv in self._inherit_fields and self._inherit_fields[dv][2]._type == 'many2many') \ + if ((dv in self._columns and self._columns[dv]._type == 'many2many') \ + or (dv in self._inherit_fields and self._inherit_fields[dv][2]._type == 'many2many')) \ and defaults[dv] and isinstance(defaults[dv][0], (int, long)): defaults[dv] = [(6, 0, defaults[dv])] - if dv in self._columns and self._columns[dv]._type == 'one2many' \ - or (dv in self._inherit_fields and self._inherit_fields[dv][2]._type == 'one2many') \ + if (dv in self._columns and self._columns[dv]._type == 'one2many' \ + or (dv in self._inherit_fields and self._inherit_fields[dv][2]._type == 'one2many')) \ and isinstance(defaults[dv], (list, tuple)) and isinstance(defaults[dv][0], dict): defaults[dv] = [(0, 0, x) for x in defaults[dv]] defaults.update(values) |