Merge lp:~fabien-morin/unifield-server/fm-us-3166 into lp:unifield-server/uf5

[jftempo]

=== modified file 'bin/addons/msf_partner/partner.py'
--- bin/addons/msf_partner/partner.py	2017-02-16 14:33:25 +0000
+++ bin/addons/msf_partner/partner.py	2017-07-10 14:18:30 +0000
@@ -442,10 +442,15 @@
         partner_id, partner_name = user_obj.get_current_company_partner_id(cr, uid)
 
         # remove partner which have same name than the current instance
-        read_result = self.read(cr, uid, ids, ['name'], context=context)
-        read_result = [(x['id'], x['name']) for x in read_result if x['name'] != partner_name]
-
-        for partner_id, partner_name in read_result:
+        read_result = self.read(cr, uid, ids, ['name', 'partner_type'], context=context)
+        read_result = [(x['id'], x['name'], x['partner_type']) for x in read_result if x['name'] != partner_name]
+
+        for partner_id, partner_name, partner_type in read_result:
+
+            # US-3166: the constraint do not apply to the internal partners
+            if partner_type == 'internal':
+                continue
+
             # check the current name is not already used by another section or
             # intermission partner
             name_exists = self.search_exist(cr, uid, [