Merge lp:~jfb-tempo-consulting/unifield-server/us-3808 into lp:~julie-w/unifield-server/US-3808

[jftempo]

[jftempo (jfb-tempo-consulting)]

Julie,

Here is a proposal to change the code:
  - test condition after write / creation so we don't have to play with vals['address'][0][2]
  - do not change the context (active_test) as it can be used in the following code.

Do you agree ?

[jftempo (jfb-tempo-consulting)]

Last point: the check is done on creation (as requested in the ticket), but also on modification.
It can result in an error msg if a process tries to write something in a duplicated partner (for example Action "Reconciliation: Go to Next Partner" from JI form view).

=== modified file 'bin/addons/msf_partner/partner.py'
--- bin/addons/msf_partner/partner.py	2018-01-26 08:50:13 +0000
+++ bin/addons/msf_partner/partner.py	2018-02-02 14:43:05 +0000
@@ -594,7 +594,7 @@
             +[_('%s (Journal Item)') % (aml['move_id'] and aml['move_id'][1] or '') for aml in aml_obj.read(cr, uid, aml_ids, ['move_id'])]
         )
 
-    def check_partner_unicity(self, cr, uid, vals, partner_id=None, context=None):
+    def check_partner_unicity(self, cr, uid, partner_id, context=None):
         """
         If the partner name is already used, check that the city is not empty AND not used by another partner with the
         same name. Checks are case insensitive, done with active and inactive partners, and NOT done at synchro time.
@@ -602,21 +602,10 @@
         if context is None:
             context = {}
         if not context.get('sync_update_execution'):
-            old_partner = None
-            partner_name = city = ''
-            if partner_id:
-                old_partner = self.browse(cr, uid, partner_id, fields_to_fetch=['name', 'city'], context=context)
-            if 'name' in vals:
-                partner_name = vals.get('name', '')
-            elif old_partner:
-                partner_name = old_partner.name
-            if 'address' in vals:
-                city = len(vals['address']) == 1 and len(vals['address'][0]) == 3 and vals['address'][0][2].get('city') or ''
-            elif old_partner:
-                city = old_partner.city or ''
-            partner_domain = partner_id and [('id', '!=', partner_id)] or []
-            partner_domain.append(('name', '=ilike', partner_name))
-            context.update({'active_test': False})
+            old_partner = self.browse(cr, uid, partner_id, fields_to_fetch=['name', 'city'], context=context)
+            partner_name = old_partner.name
+            city = old_partner.city or ''
+            partner_domain = [('id', '!=', partner_id), ('name', '=ilike', partner_name), ('active', 'in', ['t', 'f'])]
             duplicate_partner_ids = self.search(cr, uid, partner_domain, order='NO_ORDER', context=context)
             if duplicate_partner_ids:
                 if not city or self.search_exist(cr, uid, [('id', 'in', duplicate_partner_ids), ('city', '=ilike', city)], context=context):
@@ -660,9 +649,10 @@
 
         if vals.get('name'):
             vals['name'] = vals['name'].strip()
+        ret = super(res_partner, self).write(cr, uid, ids, vals, context=context)
         for partner_id in ids:
-            self.check_partner_unicity(cr, uid, vals, partner_id=partner_id, context=context)
-        return super(res_partner, self).write(cr, uid, ids, vals, context=context)
+            self.check_partner_unicity(cr, uid, partner_id=partner_id, context=context)
+        return ret
 
     def create(self, cr, uid, vals, context=None):
         if context is None:
@@ -691,8 +681,9 @@
 
         if vals.get('name'):
             vals['name'] = vals['name'].strip()
-        self.check_partner_unicity(cr, uid, vals, context=context)
-        return super(res_partner, self).create(cr, uid, vals, context=context)
+        new_id = super(res_partner, self).create(cr, uid, vals, context=context)
+        self.check_partner_unicity(cr, uid, partner_id=new_id, context=context)
+        return new_id
 
 
     def copy_data(self, cr, uid, id, default=None, context=None):