Merge lp:~unifield-team/unifield-server/us-1361 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_split.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_split.py	2016-03-23 09:07:28 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_split.py	2016-07-21 08:17:08 +0000
@@ -291,8 +291,9 @@
             total = 0.00
             for line in wiz.line_ids:
                 total += line.amount
-            if abs(wiz.original_amount - total) > 10**-2:
-                raise osv.except_osv(_('Error'), _('Wrong total: %.2f, instead of: %.2f') % (total or 0.00, wiz.original_amount or 0.00,))
+            if abs(abs(wiz.original_amount) - abs(total)) > 0.000000000001:
+                # US-1361 tolerate minimal python rounding gap
+                raise osv.except_osv(_('Error'), _('Wrong total: %f, instead of: %.2f') % (total or 0.00, wiz.original_amount or 0.00,))
 
             self.write(cr, uid, [wiz.id], {'running': True})
             # If all is OK, do process of lines
 
=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_validation.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2016-05-27 10:19:09 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2016-07-21 08:17:08 +0000
@@ -89,7 +89,8 @@
                 self.pool.get('free.2.distribution.line').create(cr, uid, common_vals)
         return distrib_id
 
-    def create_move(self, cr, uid, ids, period_id=False, currency_id=False, date=None, journal=None, orig_acct=None, context=None):
+    def create_move(self, cr, uid, ids, period_id=False, currency_id=False,
+        date=None, journal=None, orig_acct=None, doc_date=None, context=None):
         """
         Create a move with given hq entries lines
         Return created lines (except counterpart lines)
@@ -125,7 +126,7 @@
             # create move
             move_id = self.pool.get('account.move').create(cr, uid, {
                 'date': date,
-                'document_date': date,
+                'document_date': doc_date or date,
                 'journal_id': journal_id,
                 'period_id': period_id,
             })
@@ -181,7 +182,7 @@
                 'move_id': move_id,
                 'date': date,
                 'date_maturity': date,
-                'document_date': date,
+                'document_date': doc_date or date,
                 'name': 'HQ Entry Counterpart',
                 'currency_id': currency_id,
             })
@@ -234,7 +235,7 @@
         # Create the original line as it is (and its reverse)
         for line in original_lines:
             # PROCESS ORIGINAL LINES
-            res_move = self.create_move(cr, uid, line.id, line.period_id.id, line.currency_id.id, date=line.date, context=context)
+            res_move = self.create_move(cr, uid, line.id, line.period_id.id, line.currency_id.id, date=line.date, doc_date=line.document_date, context=context)
             original_move = aml_obj.browse(cr, uid, res_move[line.id])
 
             move_id = original_move.move_id.id
@@ -248,7 +249,7 @@
             aml_obj.write(cr, uid, original_move.id, {'corrected': True, 'have_an_historic': True} , context=context)
             original_account_id = original_move.account_id.id
 
-            new_res_move = self.create_move(cr, uid, [x.id for x in line.split_ids], line.period_id.id, line.currency_id.id, date=line.date, journal=od_journal_id, orig_acct=original_account_id)
+            new_res_move = self.create_move(cr, uid, [x.id for x in line.split_ids], line.period_id.id, line.currency_id.id, date=line.date, doc_date=line.document_date, journal=od_journal_id, orig_acct=original_account_id)
             # original move line
             original_ml_result = res_move[line.id]
             # Mark new journal items as corrections for the first one
@@ -277,6 +278,7 @@
                 'reversal_line_id': original_move.id,
                 'partner_txt': original_move.partner_txt or '',
                 'reference': line.ref or ' ', # UFTP-342: if HQ entry reference is empty, do not display anything. As a field function exists for account_move_line object, so we add a blank char to avoid this problem
+                'document_date': line.document_date,  # US-1361
                 }, context=context, check=False, update_check=False)
 
             # create the analytic lines as a reversed copy of the original