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

[jftempo]

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2019-02-06 09:25:31 +0000
+++ bin/addons/account_override/account.py	2019-03-20 14:43:47 +0000
@@ -516,6 +516,22 @@
                 raise osv.except_osv(_('Warning !'),
                                      _('An account set as "Included in revaluation" must be set as "Reconcile".'))
 
+    def _check_existing_entries(self, cr, uid, account_id, context=None):
+        """
+        Displays a message visible on top of the page in case some JI booked on the account_id have a posting date
+        outside the account activation time interval
+        """
+        if context is None:
+            context = {}
+        aml_obj = self.pool.get('account.move.line')
+        if account_id and not context.get('sync_update_execution'):
+            account_fields = ['activation_date', 'inactivation_date', 'code', 'name']
+            account = self.browse(cr, uid, account_id, fields_to_fetch=account_fields, context=context)
+            aml_dom = [('account_id', '=', account_id), '|', ('date', '<', account.activation_date), ('date', '>=', account.inactivation_date)]
+            if aml_obj.search_exist(cr, uid, aml_dom, context=context):
+                self.log(cr, uid, account_id, _('At least one Journal Item using the Account "%s - %s" has a Posting Date '
+                                                'outside the activation dates selected.') % (account.code, account.name))
+
     def create(self, cr, uid, vals, context=None):
         self._check_date(vals)
         self._check_allowed_partner_type(vals)
@@ -541,6 +557,7 @@
             res = res and super(account_account, self).write(cr, uid, [acc.id], newvals, context=context)
         for account_id in ids:
             self._check_reconcile_status(cr, uid, account_id, context=context)
+            self._check_existing_entries(cr, uid, account_id, context=context)
         return res
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
 
=== modified file 'bin/addons/analytic_override/analytic_account.py'
--- bin/addons/analytic_override/analytic_account.py	2019-02-14 14:44:01 +0000
+++ bin/addons/analytic_override/analytic_account.py	2019-03-20 14:43:47 +0000
@@ -442,6 +442,30 @@
                     raise osv.except_osv(_('Warning !'), _('You cannot have the same name between analytic accounts in the same category!'))
         return True
 
+    def _check_existing_entries(self, cr, uid, analytic_account_id, context=None):
+        """
+        Checks if some AJI booked on the analytic_account_id are outside the account activation time interval.
+        For FP and Free accounts: check is done on Doc Date. If AJI are found an error is raised to prevent Saving the account.
+        For other accounts: check is done on Posting Date. If AJI are found only a message is displayed on top of the page.
+        """
+        if context is None:
+            context = {}
+        aal_obj = self.pool.get('account.analytic.line')
+        if analytic_account_id:
+            analytic_acc_fields = ['date_start', 'date', 'code']
+            analytic_acc = self.browse(cr, uid, analytic_account_id, fields_to_fetch=analytic_acc_fields, context=context)
+            aal_dom_fp_free = [('account_id', '=', analytic_account_id),
+                               '|', ('document_date', '<', analytic_acc.date_start), ('document_date', '>=', analytic_acc.date)]
+            if aal_obj.search_exist(cr, uid, aal_dom_fp_free, context=context):
+                raise osv.except_osv(_('Error'), _('At least one Analytic Journal Item using the Analytic Account %s '
+                                                   'has a Document Date outside the activation dates selected.') % (analytic_acc.code))
+            if not context.get('sync_update_execution'):
+                aal_dom_cc_dest = ['|', ('cost_center_id', '=', analytic_account_id), ('destination_id', '=', analytic_account_id),
+                                   '|', ('date', '<', analytic_acc.date_start), ('date', '>=', analytic_acc.date)]
+                if aal_obj.search_exist(cr, uid, aal_dom_cc_dest, context=context):
+                    self.log(cr, uid, analytic_account_id, _('At least one Analytic Journal Item using the Analytic Account %s '
+                                                             'has a Posting Date outside the activation dates selected.') % (analytic_acc.code))
+
     def create(self, cr, uid, vals, context=None):
         """
         Some verifications before analytic account creation
@@ -485,6 +509,8 @@
             if cat_instance:
                 self.check_fp(cr, uid, cat_instance, context=context)
         self._check_name_unicity(cr, uid, ids, context=context)
+        for analytic_acc_id in ids:
+            self._check_existing_entries(cr, uid, analytic_acc_id, context=context)
         return res
 
     def unlink(self, cr, uid, ids, context=None):
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-03-04 11:05:48 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-03-20 14:43:47 +0000
@@ -105335,3 +105335,21 @@
 msgstr "\n"
 "                                        Attention: Les lignes suivantes ont des qté ou des montants sur plus de 15 chiffres. Veuillez vérifier la qté et le prix unitaire pour éviter des pertes d'information:\n"
 "                                    "
+
+#. module: analytic_override
+#: code:addons/analytic_override/analytic_account.py:460
+#, python-format
+msgid "At least one Analytic Journal Item using the Analytic Account %s has a Document Date outside the activation dates selected."
+msgstr "Au moins une Ligne d'Ecriture Analytique utilisant le Compte Analytique %s a une Date de Document en dehors des dates d'activation sélectionnées."
+
+#. module: analytic_override
+#: code:addons/analytic_override/analytic_account.py:466
+#, python-format
+msgid "At least one Analytic Journal Item using the Analytic Account %s has a Posting Date outside the activation dates selected."
+msgstr "Au moins une Ligne d'Ecriture Analytique utilisant le Compte Analytique %s a une Date de Comptabilisation en dehors des dates d'activation sélectionnées."
+
+#. module: account_override
+#: code:addons/account_override/account.py:532
+#, python-format
+msgid "At least one Journal Item using the Account \"%s - %s\" has a Posting Date outside the activation dates selected."
+msgstr "Au moins une Ligne d'Ecriture Comptable utilisant le Compte \"%s - %s\" a une Date de Comptabilisation en dehors des dates d'activation sélectionnées."