From d544bb9b460d334f6ba8c20a557584a467e9d2e8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 24 Mar 2015 15:43:37 +0100
Subject: [PATCH] [FIX] base_partner_merge: cleaner test for function fields

After commit 0ed63d73a649b7dc5469136c24f49949e7859339,
the hack used to detect fields.function is not supported
anymore. Using `isinstance` is safer and cleaner anyway
(performance is not a concern here).
---
 addons/crm/base_partner_merge.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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: