[FIX] crm: base_partner_merge: be tolerant to unknown model of field in ir.model.fields

bzr revid: chs@openerp.com-20131014141330-h4qk2iqhn5gywrim
2013-10-14 16:13:30 +02:00
parent 34d2fd4d02
commit 6322df1889
1 changed files with 6 additions and 3 deletions
@@ -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