diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py index f76c77553e9..9afcc9d2aa4 100644 --- a/addons/crm/base_partner_merge.py +++ b/addons/crm/base_partner_merge.py @@ -245,12 +245,12 @@ class MergePartnerAutomatic(osv.TransientModel): for record in proxy.browse(cr, openerp.SUPERUSER_ID, record_ids, context=context): try: proxy_model = self.pool[record.model] - field_type = proxy_model._columns[record.name].__class__._type + column = proxy_model._columns[record.name] except KeyError: # unknown model or field => skip continue - if field_type == 'function': + if isinstance(column, fields.function): continue for partner in src_partners: