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

[FIX] base_partner_merge: properly ignore computed fields when merging 2 partners 

bzr revid: odo@openerp.com-20130605161622-7xj8b585sslvd3lj
This commit is contained in:
Olivier Dony 2013-06-05 18:16:22 +02:00
parent 691cd6e2a5
commit 0298755c67
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/crm/base_partner_merge.py
View File

@ -264,7 +264,7 @@ class MergePartnerAutomatic(osv.TransientModel):
values = dict()
for column, field in columns.iteritems():
if field._type not in ('many2many', 'one2many', 'function'):
if field._type not in ('many2many', 'one2many') and not isinstance(field, fields.function):
for item in itertools.chain(src_partners, [dst_partner]):
if item[column]:
values[column] = write_serializer(column, item[column])