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

[jftempo]

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2019-08-08 10:26:27 +0000
+++ bin/addons/account_override/account.py	2019-08-22 14:00:42 +0000
@@ -1248,6 +1248,8 @@
         if default is None:
             default = {}
 
+        setup_obj = self.pool.get('unifield.setup.configuration')
+
         context.update({'omit_analytic_distribution': False})
         je = self.browse(cr, uid, [a_id], context=context)[0]
 
@@ -1263,12 +1265,18 @@
             period_id = new_period[0]
             date_start = period_obj.read(cr, uid, period_id, ['date_start'], context=context)['date_start']
             date_start_dt = datetime.datetime.strptime(date_start, '%Y-%m-%d')
-            doc_date = (datetime.datetime.strptime(je.document_date, '%Y-%m-%d') + relativedelta(month=date_start_dt.month, year=date_start_dt.year)).strftime('%Y-%m-%d')
             post_date = (datetime.datetime.strptime(je.date, '%Y-%m-%d') + relativedelta(month=date_start_dt.month,year=date_start_dt.year)).strftime('%Y-%m-%d')
+            # doc. date is the original one except if doc and posting dates would be in different FY:
+            # if this is forbidden in the configuration, the doc. date will be 'FY-01-01'
+            if datetime.datetime.strptime(je.document_date, '%Y-%m-%d').year != date_start_dt.year and \
+                    not setup_obj.get_config(cr, uid).previous_fy_dates_allowed:
+                doc_date = '%s-01-01' % date_start_dt.year
+            else:
+                doc_date = je.document_date
         else:
-            doc_date = je.document_date
             period_id = je.period_id and je.period_id.id or False
             post_date = je.date
+            doc_date = je.document_date
 
         vals = {
             'line_id': [],
@@ -1281,6 +1289,7 @@
         res = super(account_move, self).copy(cr, uid, a_id, vals, context=context)
         for line in je.line_id:
             line_default = {
+                'analytic_lines': [],
                 'move_id': res,
                 'document_date': doc_date,
                 'date': post_date,

=== modified file 'bin/addons/analytic_distribution/account_move_line.py'
--- bin/addons/analytic_distribution/account_move_line.py	2018-10-12 14:22:28 +0000
+++ bin/addons/analytic_distribution/account_move_line.py	2019-08-22 14:00:42 +0000
@@ -56,14 +56,17 @@
         res = {}
         distrib_obj = self.pool.get('analytic.distribution')
         sql = """
-            SELECT aml.id, aml.analytic_distribution_id AS distrib_id, m.analytic_distribution_id AS move_distrib_id, aml.account_id
+            SELECT aml.id, aml.analytic_distribution_id AS distrib_id, m.analytic_distribution_id AS move_distrib_id, aml.account_id, 
+            aml.document_date, aml.date, m.status
             FROM account_move_line AS aml, account_move AS m
             WHERE aml.move_id = m.id
             AND aml.id IN %s
             ORDER BY aml.id;"""
         cr.execute(sql, (tuple(ids),))
         for line in cr.fetchall():
-            res[line[0]] = distrib_obj._get_distribution_state(cr, uid, line[1], line[2], line[3])
+            manual = line[6] == 'manu'
+            res[line[0]] = distrib_obj._get_distribution_state(cr, uid, line[1], line[2], line[3],
+                                                               doc_date=line[4], posting_date=line[5], manual=manual)
         return res
 
     def _have_analytic_distribution_from_header(self, cr, uid, ids, name, arg, context=None):
@@ -483,7 +486,10 @@
         if context.get('from_web_menu', False):
             res = []
             for ml in self.browse(cr, uid, ids):
-                distrib_state = self.pool.get('analytic.distribution')._get_distribution_state(cr, uid, ml.analytic_distribution_id.id, ml.move_id and ml.move_id.analytic_distribution_id and ml.move_id.analytic_distribution_id.id or False, vals.get('account_id') or ml.account_id.id)
+                distrib_state = self.pool.get('analytic.distribution')._get_distribution_state(cr, uid, ml.analytic_distribution_id.id,
+                                                                                               ml.move_id and ml.move_id.analytic_distribution_id and ml.move_id.analytic_distribution_id.id or False,
+                                                                                               vals.get('account_id') or ml.account_id.id,
+                                                                                               doc_date=ml.document_date, posting_date=ml.date, manual=ml.move_id.status=='manu')
                 if distrib_state in ['invalid', 'none']:
                     vals.update({'state': 'draft'})
                 # Add account_id because of an error with account_activable module for checking date

=== modified file 'bin/addons/analytic_distribution/analytic_distribution.py'
--- bin/addons/analytic_distribution/analytic_distribution.py	2019-04-17 10:00:14 +0000
+++ bin/addons/analytic_distribution/analytic_distribution.py	2019-08-22 14:00:42 +0000
@@ -42,12 +42,14 @@
                 return False
         return True
 
-    def _get_distribution_state(self, cr, uid, distrib_id, parent_id, account_id, context=None):
+    def _get_distribution_state(self, cr, uid, distrib_id, parent_id, account_id, context=None,
+                                doc_date=False, posting_date=False, manual=False):
         """
         Return distribution state
         """
         if context is None:
             context = {}
+        analytic_acc_obj = self.pool.get('account.analytic.account')
         # Have an analytic distribution on another account than analytic-a-holic account make no sense. So their analytic distribution is valid
         if account_id:
             account =  self.pool.get('account.account').read(cr, uid, account_id, ['is_analytic_addicted'])
@@ -75,11 +77,20 @@
                                                     cc_line.analytic_id and cc_line.analytic_id.id or False, context=context):
                 return 'invalid'
         # Check Funding pool lines regarding:
+        # - date validity for manual entries only
         # - destination / account
         # - destination / cost center
         # - If analytic account is MSF Private funds
         # - Cost center and funding pool compatibility
         for fp_line in distrib.funding_pool_lines:
+            if manual:
+                if posting_date:
+                    if not analytic_acc_obj.is_account_active(fp_line.destination_id, posting_date):
+                        return 'invalid'
+                    if not analytic_acc_obj.is_account_active(fp_line.cost_center_id, posting_date):
+                        return 'invalid'
+                if doc_date and fp_line.analytic_id and not analytic_acc_obj.is_account_active(fp_line.analytic_id, doc_date):
+                    return 'invalid'
             if fp_line.destination_id.id not in account.get('destination_ids', []):
                 return 'invalid'
             if not self.check_dest_cc_compatibility(cr, uid, fp_line.destination_id.id, fp_line.cost_center_id.id, context=context):
@@ -91,6 +102,14 @@
                 return 'invalid'
             if fp_line.cost_center_id.id not in [x.id for x in fp_line.analytic_id.cost_center_ids]:
                 return 'invalid'
+        # Check the date validity of the free accounts used in manual entries
+        if manual and doc_date:
+            for free1_line in distrib.free_1_lines:
+                if free1_line.analytic_id and not analytic_acc_obj.is_account_active(free1_line.analytic_id, doc_date):
+                    return 'invalid'
+            for free2_line in distrib.free_2_lines:
+                if free2_line.analytic_id and not analytic_acc_obj.is_account_active(free2_line.analytic_id, doc_date):
+                    return 'invalid'
         return 'valid'
 
     def analytic_state_from_info(self, cr, uid, account_id, destination_id, cost_center_id, analytic_id, context=None):

=== modified file 'bin/addons/analytic_override/analytic_account.py'
--- bin/addons/analytic_override/analytic_account.py	2019-05-14 15:12:35 +0000
+++ bin/addons/analytic_override/analytic_account.py	2019-08-22 14:00:42 +0000
@@ -705,5 +705,14 @@
             'target': 'current',
         }
 
+    def is_account_active(self, analytic_acc_br, date_to_check):
+        """
+        Returns True if the analytic account is active at the date selected, else returns False.
+        """
+        if date_to_check < analytic_acc_br.date_start or (analytic_acc_br.date and date_to_check >= analytic_acc_br.date):
+            return False
+        return True
+
+
 analytic_account()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: