From 6322df1889d49065a6aaf95e158d83dbf59092d2 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 14 Oct 2013 16:13:30 +0200 Subject: [PATCH] [FIX] crm: base_partner_merge: be tolerant to unknown model of field in ir.model.fields bzr revid: chs@openerp.com-20131014141330-h4qk2iqhn5gywrim --- addons/crm/base_partner_merge.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py index 42e1ab7c7ec..c73b5fdf599 100644 --- a/addons/crm/base_partner_merge.py +++ b/addons/crm/base_partner_merge.py @@ -235,9 +235,12 @@ class MergePartnerAutomatic(osv.TransientModel): record_ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context) for record in proxy.browse(cr, openerp.SUPERUSER_ID, record_ids, context=context): - proxy_model = self.pool[record.model] - - field_type = proxy_model._columns.get(record.name).__class__._type + try: + proxy_model = self.pool[record.model] + field_type = proxy_model._columns[record.name].__class__._type + except KeyError: + # unknown model or field => skip + continue if field_type == 'function': continue