odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Olivier Dony 2011-01-28 17:04:19 +01:00
parent 582efccf0c
commit 482f07f717
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/osv/orm.py
View File

@ -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)