Merge lp:~jfb-tempo-consulting/unifield-wm/us-933 into lp:unifield-wm

[jftempo]

=== modified file 'account_corrections/wizard/analytic_distribution_wizard.py'
--- account_corrections/wizard/analytic_distribution_wizard.py	2016-02-11 09:58:49 +0000
+++ account_corrections/wizard/analytic_distribution_wizard.py	2016-02-26 10:12:41 +0000
@@ -108,6 +108,16 @@
             del to_override[oline.id]
         return True, _("All is OK."), to_reverse, to_override
 
+    def _check_period_closed_on_fp_distrib_line(self, cr, uid, distrib_line_id, context=None):
+        ana_obj = self.pool.get('account.analytic.line')
+        period_obj = self.pool.get('account.period')
+        aa_ids = ana_obj.search(cr, uid, [('distrib_line_id', '=', 'funding.pool.distribution.line,%d'%distrib_line_id), ('is_reversal', '=', False), ('is_reallocated', '=', False)], context=context)
+        if aa_ids:
+            for ana in ana_obj.browse(cr, uid, aa_ids, context=context):
+                if ana.period_id and ana.period_id.state in ('done', 'mission-closed'):
+                    return True
+        return False
+
     def do_analytic_distribution_changes(self, cr, uid, wizard_id, distrib_id, context=None):
         """
         For each given wizard compare old (distrib_id) and new analytic distribution. Then adapt analytic lines.
@@ -143,7 +153,7 @@
         to_reverse = []
         old_line_ok = []
         any_reverse = False
-        period_closed = ml.period_id and ml.period_id.state and ml.period_id.state in ['done', 'mission-closed'] or False
+        #period_closed = ml.period_id and ml.period_id.state and ml.period_id.state in ['done', 'mission-closed'] or False
         ana_obj = self.pool.get('account.analytic.line')
         # Prepare journal and period information for entry sequences
         cr.execute("select id, code from account_journal where type = 'correction' and is_current_instance = true")
@@ -218,7 +228,7 @@
                         if (old_line.cost_center_id.id != wiz_line.cost_center_id.id or
                                 old_line.destination_id.id != wiz_line.destination_id.id or
                                 old_line.percentage != wiz_line.percentage):
-                            if period_closed:
+                            if self._check_period_closed_on_fp_distrib_line(cr, uid, old_line.id):
                                 to_reverse.append(wiz_line)
                             else:
                                 to_override.append(wiz_line)
@@ -240,7 +250,7 @@
             # distribution line deleted by user
             if self.pool.get('account.analytic.account').is_blocked_by_a_contract(cr, uid, [wiz_line.analytic_id.id]):
                 raise osv.except_osv(_('Error'), _("Funding pool is on a soft/hard closed contract: %s")%(wiz_line.analytic_id.code))
-            if period_closed:
+            if self._check_period_closed_on_fp_distrib_line(cr, uid, wiz_line.id):
                 # reverse the line
                 to_reverse_ids = ana_obj.search(cr, uid, [('distrib_line_id', '=', 'funding.pool.distribution.line,%d'%wiz_line.id)])
                 reversed_ids = ana_obj.reverse(cr, uid, to_reverse_ids, posting_date=wizard.date)
@@ -277,6 +287,8 @@
                 create_date = ml.date
             # create the ana line (pay attention to take original date as posting date as UF-2199 said it.
             name = False
+            #period_closed = self._check_period_closed_on_fp_distrib_line(cr, uid, wiz_line.id)
+            period_closed = ml.period_id and ml.period_id.state and ml.period_id.state in ['done', 'mission-closed'] or False
             if period_closed:
                 create_date = wizard.date
                 name = self.pool.get('account.analytic.line').join_without_redundancy(ml.name, 'COR')
@@ -296,12 +308,13 @@
             # delete distrib line
             self.pool.get('funding.pool.distribution.line').unlink(cr, uid, [line.id])
             # delete associated analytic line
-            to_delete_ids = self.pool.get('account.analytic.line').search(cr, uid, [('distrib_line_id', '=', 'funding.pool.distribution.line,%d'%line.id)])
+            to_delete_ids = self.pool.get('account.analytic.line').search(cr, uid, [('distrib_line_id', '=', 'funding.pool.distribution.line,%d'%line.id), ('is_reversal', '=', False), ('is_reallocated', '=', False)])
             self.pool.get('account.analytic.line').unlink(cr, uid, to_delete_ids)
 
         #####
         ## FP: TO REVERSE
         ###
+        to_reverse_ids = []
         for line in to_reverse:
             # reverse the line
             to_reverse_ids = self.pool.get('account.analytic.line').search(cr, uid, [('distrib_line_id', '=', 'funding.pool.distribution.line,%d'%line.distribution_line_id.id), ('is_reversal', '=', False), ('is_reallocated', '=', False)])
@@ -347,7 +360,7 @@
                 greater_amount['aji_id'] = ret[ret.keys()[0]]
                 greater_amount['date'] = wizard.date
         # UFTP-194: Set missing entry sequence for created analytic lines
-        if have_been_created:
+        if have_been_created and to_reverse_ids:
             cr.execute('update account_analytic_line set entry_sequence = %s, last_corrected_id = %s where id in %s', (get_entry_seq(entry_seq_data), to_reverse_ids[0], tuple(have_been_created)))
 
         #####

=== modified file 'analytic_distribution/analytic_line.py'
--- analytic_distribution/analytic_line.py	2016-02-04 17:03:55 +0000
+++ analytic_distribution/analytic_line.py	2016-02-26 10:12:41 +0000
@@ -263,7 +263,7 @@
         for aline in self.browse(cr, uid, ids, context=context):
             if account.category in ['OC', 'DEST']:
                 # Period verification
-                period = aline.move_id and aline.move_id.period_id or False
+                period = aline.period_id
                 # Prepare some values
                 fieldname = 'cost_center_id'
                 if account.category == 'DEST':