From a6a27d0e20b226420113347577b218c7e98e4513 Mon Sep 17 00:00:00 2001 From: Charbel Jacquin Date: Thu, 15 Oct 2015 11:57:02 +0200 Subject: [PATCH] refine test following discussion on #180 --- base_partner_merge/base_partner_merge.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base_partner_merge/base_partner_merge.py b/base_partner_merge/base_partner_merge.py index 7b55f1093..d9def5d34 100644 --- a/base_partner_merge/base_partner_merge.py +++ b/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: