Merge lp:~julie-w/unifield-server/US-4306 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_partner/partner.py'
--- bin/addons/msf_partner/partner.py	2018-03-01 16:19:31 +0000
+++ bin/addons/msf_partner/partner.py	2018-03-02 15:56:40 +0000
@@ -23,6 +23,7 @@
 from osv import osv
 from osv import fields
 from msf_partner import PARTNER_TYPE
+from account_override import ACCOUNT_RESTRICTED_AREA
 from msf_field_access_rights.osv_override import _get_instance_level
 import time
 from tools.translate import _
@@ -588,6 +589,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'])]
         )
 
+<<<<<<< TREE
     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
@@ -619,6 +621,30 @@
 
         return ret
 
+=======
+    def _check_default_accounts(self, cr, uid, vals, context=None):
+        """
+        Checks if the property_account_receivable and property_account_payable in vals are allowed based on the domains
+        stored in ACCOUNT_RESTRICTED_AREA. If not raises a warning.
+        """
+        if context is None:
+            context = {}
+        if not context.get('sync_update_execution'):
+            account_obj = self.pool.get('account.account')
+            if vals.get('property_account_receivable'):
+                receivable_domain = [('id', '=', vals['property_account_receivable'])]
+                receivable_domain.extend(ACCOUNT_RESTRICTED_AREA['partner_receivable'])
+                if not account_obj.search_exist(cr, uid, receivable_domain, context=context):
+                    receivable_acc = account_obj.browse(cr, uid, vals['property_account_receivable'], fields_to_fetch=['code', 'name'], context=context)
+                    raise osv.except_osv(_('Error'), _('The account %s - %s cannot be used as Account Receivable.') % (receivable_acc.code, receivable_acc.name))
+            if vals.get('property_account_payable'):
+                payable_domain = [('id', '=', vals['property_account_payable'])]
+                payable_domain.extend(ACCOUNT_RESTRICTED_AREA['partner_payable'])
+                if not account_obj.search_exist(cr, uid, payable_domain, context=context):
+                    payable_acc = account_obj.browse(cr, uid, vals['property_account_payable'], fields_to_fetch=['code', 'name'], context=context)
+                    raise osv.except_osv(_('Error'), _('The account %s - %s cannot be used as Account Payable.') % (payable_acc.code, payable_acc.name))
+
+>>>>>>> MERGE-SOURCE
     def write(self, cr, uid, ids, vals, context=None):
         if not ids:
             return True
@@ -663,6 +689,7 @@
         if context is None:
             context = {}
         vals = self.check_pricelists_vals(cr, uid, vals, context=context)
+        self._check_default_accounts(cr, uid, vals, context=context)
         if 'partner_type' in vals and vals['partner_type'] in ('internal', 'section', 'esc', 'intermission'):
             msf_customer = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_internal_customers')
             msf_supplier = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_internal_suppliers')

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-03-01 16:19:31 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-03-02 15:56:40 +0000
@@ -107116,6 +107116,7 @@
 msgid "Page need to be refreshed - please press \"F5\""
 msgstr "La page doit être rafraîchie, veuillez cliquer sur \"F5\""
 
+<<<<<<< TREE
 #. module: msf_partner
 #: code:addons/msf_partner/partner.py:623
 #, python-format
@@ -107195,3 +107196,16 @@
 msgid "Access Denied"
 msgstr "Accès Refusé"
 
+=======
+#. module: msf_partner
+#: code:addons/msf_partner/partner.py:611
+#, python-format
+msgid "The account %s - %s cannot be used as Account Receivable."
+msgstr "Le compte %s - %s ne peut pas être utilisé comme Compte Client."
+
+#. module: msf_partner
+#: code:addons/msf_partner/partner.py:617
+#, python-format
+msgid "The account %s - %s cannot be used as Account Payable."
+msgstr "Le compte %s - %s ne peut pas être utilisé comme Compte Fournisseur."
+>>>>>>> MERGE-SOURCE