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

[jftempo]

=== modified file 'account_corrections/wizard/analytic_distribution_wizard.py'
--- account_corrections/wizard/analytic_distribution_wizard.py	2016-02-05 09:06:52 +0000
+++ account_corrections/wizard/analytic_distribution_wizard.py	2016-02-11 14:02:28 +0000
@@ -360,13 +360,6 @@
             amount_cur = (ml.credit_currency - ml.debit_currency) * line.percentage / 100
             amount = self.pool.get('res.currency').compute(cr, uid, ml.currency_id.id, company_currency_id, amount_cur, round=False, context=ctx)
 
-            date_to_use = orig_date
-            if ml.journal_id.type == 'hq':
-                # US-773: keep date when correcting hq entry
-                date_to_use = False
-            # UFTP-169: Use the correction line date in case we are correcting a line that is a correction of another line.
-            if ml.corrected_line_id:
-                date_to_use = ml.date
             vals = {
                 'account_id': line.analytic_id.id,
                 'cost_center_id': line.cost_center_id.id,
@@ -374,21 +367,15 @@
                 'amount_currency': amount_cur,
                 'amount': amount,
             }
-            if date_to_use:
+
+            # UFTP-169: Use the correction line date in case we are correcting a line that is a correction of another line.
+            if ml.corrected_line_id:
                 vals.update({
-                    'date': date_to_use,
+                    'date': ml.date,
                     'source_date': orig_date,
                     'document_date': orig_document_date,
                 })
             self.pool.get('account.analytic.line').write(cr, uid, to_override_ids, vals)
-            # UTP-1118: Fix problem of entry_sequence that is not the right one regarding the journal
-
-            # UFTP-373: The block below is commented out, as there is no reason to replace the Seq in here
-#             for ana_line in self.pool.get('account.analytic.line').browse(cr, uid, to_override_ids, context=context):
-#                 prefix = ana_line.instance_id.move_prefix
-#                 seqnum = ana_line.entry_sequence.split('-')[2]
-#                 entry_seq = "%s-%s-%s" % (prefix, ana_line.journal_id.code, seqnum)
-#                 cr.execute('UPDATE account_analytic_line SET entry_sequence = %s WHERE id = %s', (entry_seq, ana_line.id))
             # update the distib line
             self.pool.get('funding.pool.distribution.line').write(cr, uid, [line.distribution_line_id.id], {
                     'analytic_id': line.analytic_id.id,
@@ -398,7 +385,7 @@
                 })
             if greater_amount['gap_amount'] and greater_amount['wl'] and greater_amount['wl'].id == line.id:
                 greater_amount['aji_id'] = to_override_ids[0]
-                greater_amount['date'] = date_to_use
+                greater_amount['date'] = orig_date
 
         #####
         # US-676