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

[jftempo]

=== modified file 'vertical_integration/report/hq_report_ocb_matching.py'
--- vertical_integration/report/hq_report_ocb_matching.py	2015-09-16 09:26:03 +0000
+++ vertical_integration/report/hq_report_ocb_matching.py	2016-01-19 10:38:39 +0000
@@ -86,7 +86,7 @@
         sqlrequests = {
             # Do not take lines that come from a HQ or MIGRATION journal
             'reconciliable': """
-                SELECT aml.id, m.name AS "entry_sequence", aml.name, aml.ref, aml.document_date, aml.date, a.code, aml.partner_txt, debit_currency, credit_currency, c.name AS "Booking Currency", aml.debit, aml.credit, cc.name AS "functional_currency", aml.reconcile_id
+                SELECT aml.id, m.name AS "entry_sequence", aml.name, aml.ref, aml.document_date, aml.date, a.code, aml.partner_txt, debit_currency, credit_currency, c.name AS "Booking Currency", ROUND(aml.debit, 2), ROUND(aml.credit, 2), cc.name AS "functional_currency", aml.reconcile_id
                 FROM account_move_line AS aml, account_move AS m, account_account AS a, res_currency AS c, res_company AS e, res_currency AS cc, account_journal AS j
                 WHERE aml.move_id = m.id
                 AND aml.account_id = a.id