From 0f846abe138939d4c54ad51e35b7e166424e2537 Mon Sep 17 00:00:00 2001
From: cesarcruz <juliocesarrodriguezcruz@gmail.com>
Date: Mon, 15 Jun 2015 16:16:34 -0500
Subject: [PATCH] Fix missed condition on merge contacts with different emails.

---
 base_partner_merge/base_partner_merge.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/base_partner_merge/base_partner_merge.py b/base_partner_merge/base_partner_merge.py
index 6127808b3..89d4ada37 100644
--- a/base_partner_merge/base_partner_merge.py
+++ b/base_partner_merge/base_partner_merge.py
@@ -360,7 +360,8 @@ class MergePartnerAutomatic(orm.TransientModel):
                   "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(