Merge lp:~unifield-team/unifield-wm/us-773 into lp:unifield-wm

[jftempo]

=== modified file 'account_corrections/wizard/analytic_distribution_wizard.py'
--- account_corrections/wizard/analytic_distribution_wizard.py	2015-11-26 16:41:44 +0000
+++ account_corrections/wizard/analytic_distribution_wizard.py	2015-12-04 08:35:31 +0000
@@ -347,20 +347,28 @@
             ctx = {'date': orig_date}
             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)
-            # UFTP-169: Use the correction line date in case we are correcting a line that is a correction of another line.
+
             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
-            self.pool.get('account.analytic.line').write(cr, uid, to_override_ids, {
-                    'account_id': line.analytic_id.id,
-                    'cost_center_id': line.cost_center_id.id,
-                    'destination_id': line.destination_id.id,
-                    'amount_currency': amount_cur,
-                    'amount': amount,
+            vals = {
+                'account_id': line.analytic_id.id,
+                'cost_center_id': line.cost_center_id.id,
+                'destination_id': line.destination_id.id,
+                'amount_currency': amount_cur,
+                'amount': amount,
+            }
+            if date_to_use:
+                vals.update({
                     'date': date_to_use,
                     '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

=== modified file 'analytic_distribution/analytic_line.py'
--- analytic_distribution/analytic_line.py	2015-11-20 10:11:55 +0000
+++ analytic_distribution/analytic_line.py	2015-12-04 08:35:31 +0000
@@ -239,13 +239,26 @@
             return False
         if not date:
             date = strftime('%Y-%m-%d')
+
         # Prepare some value
         account = self.pool.get('account.analytic.account').browse(cr, uid, [account_id], context)[0]
         context.update({'from': 'mass_reallocation'}) # this permits reallocation to be accepted when rewrite analaytic lines
-        correction_journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type', '=', 'correction'), ('is_current_instance', '=', True)])
+        move_prefix = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.instance_id.move_prefix
+
+        aaj_obj = self.pool.get('account.analytic.journal')
+        correction_journal_ids = aaj_obj.search(cr, uid, [('type', '=', 'correction'), ('is_current_instance', '=', True)])
         correction_journal_id = correction_journal_ids and correction_journal_ids[0] or False
         if not correction_journal_id:
             raise osv.except_osv(_('Error'), _('No analytic journal found for corrections!'))
+
+        # sequence info from GL journal
+        aj_obj = self.pool.get('account.journal')
+        gl_correction_journal_ids = aj_obj.search(cr, uid, [('type', '=', 'correction'), ('is_current_instance', '=', True)])
+        gl_correction_journal_id = gl_correction_journal_ids and gl_correction_journal_ids[0] or False
+        if not gl_correction_journal_id:
+            raise osv.except_osv(_('Error'), _('No GL journal found for corrections!'))
+        gl_correction_journal_rec = aj_obj.browse(cr, uid, gl_correction_journal_id, context=context)
+
         # Process lines
         for aline in self.browse(cr, uid, ids, context=context):
             if account.category in ['OC', 'DEST']:
@@ -255,13 +268,31 @@
                 fieldname = 'cost_center_id'
                 if account.category == 'DEST':
                     fieldname = 'destination_id'
-                # if period is not closed, so override line.
-                if period and period.state not in ['done', 'mission-closed']:
+
+                # update or reverse ?
+                update = period and period.state not in ['done', 'mission-closed']
+                if aline.journal_id.type == 'hq':
+                    # US-773/2: if HQ entry always like period closed fashion
+                    update = False
+
+                if update:
+                    # not mission close: override line
                     # Update account # Date: UTP-943 speak about original date for non closed periods
-                    self.write(cr, uid, [aline.id], {fieldname: account_id, 'date': aline.date,
-                        'source_date': aline.source_date or aline.date}, context=context)
+                    vals = {
+                        fieldname: account_id,
+                        'date': aline.date,
+                        'source_date': aline.source_date or aline.date,
+                    }
+                    self.write(cr, uid, [aline.id], vals, context=context)
                 # else reverse line before recreating them with right values
                 else:
+                    # mission close or + or HQ entry: reverse
+
+                    # compute entry sequence
+                    seq_num_ctx = period and {'fiscalyear_id': period.fiscalyear_id.id} or None
+                    seqnum = self.pool.get('ir.sequence').get_id(cr, uid, gl_correction_journal_rec.sequence_id.id, context=seq_num_ctx)
+                    entry_seq = "%s-%s-%s" % (move_prefix, gl_correction_journal_rec.code, seqnum)
+
                     # First reverse line
                     rev_ids = self.pool.get('account.analytic.line').reverse(cr, uid, [aline.id], posting_date=date)
                     # UTP-943: Shoud have a correction journal on these lines
@@ -279,6 +310,13 @@
                     self.pool.get('account.analytic.line').write(cr, uid, cor_ids, {'last_corrected_id': aline.id})
                     # finally flag analytic line as reallocated
                     self.pool.get('account.analytic.line').write(cr, uid, [aline.id], {'is_reallocated': True})
+
+                    if isinstance(rev_ids, (int, long, )):
+                        rev_ids = [rev_ids]
+                    if isinstance(cor_ids, (int, long, )):
+                        cor_ids = [cor_ids]
+                    for rev_cor_id in rev_ids + cor_ids:
+                        cr.execute('update account_analytic_line set entry_sequence = %s where id = %s', (entry_seq, rev_cor_id))
             else:
                 # Update account
                 self.write(cr, uid, [aline.id], {'account_id': account_id}, context=context)