From 482f07f717ea6d81f631bf2aa1497b81b7ba7a50 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 28 Jan 2011 17:04:19 +0100 Subject: [PATCH] [FIX] orm: incorrect braces when processing default values for o2m/m2m (backport from trunk) lp bug: https://launchpad.net/bugs/704311 fixed bzr revid: odo@openerp.com-20110128160419-kospojyqffcs7u40 --- bin/osv/orm.py | 8 ++++---- 1 file 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)