Browse Source

refine test following discussion on #180

pull/188/head
Charbel Jacquin 9 years ago
parent
commit
a6a27d0e20
  1. 3
      base_partner_merge/base_partner_merge.py

3
base_partner_merge/base_partner_merge.py

@ -274,9 +274,10 @@ class MergePartnerAutomatic(orm.TransientModel):
if record.model == 'ir.property':
continue
legacy = proxy_model._columns.get(record.name)
field_spec = proxy_model._fields.get(record.name)
if field_spec.compute:
if isinstance(legacy, fields.function) or field_spec.compute:
continue
for partner in src_partners:

Loading…
Cancel
Save