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

[IMP] orm: _add_missing_default_values: handle o2m default values in the legacy form [{},{}] + inherited x2m defaults 

bzr revid: odo@openerp.com-20101018161638-i6vtq13tczf2b707
This commit is contained in:
Olivier Dony 2010-10-18 18:16:38 +02:00
parent b6272ed3a6
commit b7a2ebc828
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/osv/orm.py
View File

@ -1934,10 +1934,14 @@ 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:
# FIXME: also handle inherited m2m
if dv in self._columns and self._columns[dv]._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') \
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)
values = defaults
return values