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

[jftempo]

=== modified file 'bin/addons/account_corrections/account_move_line.py'
--- bin/addons/account_corrections/account_move_line.py	2018-03-07 15:55:17 +0000
+++ bin/addons/account_corrections/account_move_line.py	2018-04-04 15:24:38 +0000
@@ -915,7 +915,7 @@
     def set_as_corrected(self, cr, uid, ji_ids, manual=True, context=None):
         """
         Sets the JIs and their related AJIs as Corrected according to the following rules:
-        - if one of the JIs or AJIs has already been corrected it raises an error
+        - if one of the JIs or AJIs has already been corrected or if the account can't be corrected it raises an error
         - if manual = True, the Correction will be set as Manual (= the user will be able to reverse it manually)
         """
         if context is None:
@@ -924,6 +924,10 @@
             ji_ids = [ji_ids]
         aal_obj = self.pool.get('account.analytic.line')
         for ji in self.browse(cr, uid, ji_ids, fields_to_fetch=['corrected', 'move_id'], context=context):
+            # check that the account can be corrected
+            if ji.account_id.is_not_hq_correctible:
+                raise osv.except_osv(_('Error'), _('The account "%s - %s" is set as "Prevent correction on '
+                                                   'account codes".') % (ji.account_id.code, ji.account_id.name))
             # check that the JI isn't already corrected
             if ji.corrected:
                 raise osv.except_osv(_('Error'), _('The entry %s has already been corrected.') % ji.move_id.name)

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-03-20 10:40:57 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-04-04 15:24:38 +0000
@@ -107492,6 +107492,7 @@
 #, 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."
+<<<<<<< TREE
 
 #. module: account_mcdb
 #: field:account.mcdb,display_mcdb_load_button:0
@@ -107519,3 +107520,11 @@
 #, python-format
 msgid "You have to load the template first."
 msgstr "Vous devez d'abord charger le modèle."
+=======
+
+#. module: account_corrections
+#: code:addons/account_corrections/account_move_line.py:929
+#, python-format
+msgid "The account \"%s - %s\" is set as \"Prevent correction on account codes\"."
+msgstr "Le compte \"%s - %s\" est défini comme \"Empêcher toutes corrections sur ce code comptable\"."
+>>>>>>> MERGE-SOURCE