Fix missed condition on merge contacts with different emails.

OCA · Jun 15, 2015 · 1ef1fe3 · 1ef1fe3
1 parent e6a5ee8
commit 1ef1fe3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/base_partner_merge/base_partner_merge.py b/base_partner_merge/base_partner_merge.py
@@ -360,7 +360,8 @@ def _merge(self, cr, uid, partner_ids, dst_partner=None, context=None):
                   "together. You can re-open the wizard several times if "
                   "needed."))
 
-        if (len(set(partner.email for partner
+        if (openerp.SUPERUSER_ID != uid and
+            len(set(partner.email for partner
                     in proxy.browse(cr, uid, partner_ids,
                                     context=context))) > 1):
             raise orm.except_orm(