From f47b3543ee50e64f155c9dec655c624a4b084c6f Mon Sep 17 00:00:00 2001
From: invitu <invitu@users.noreply.github.com>
Date: Mon, 19 Dec 2016 00:53:35 -1000
Subject: [PATCH] [IMP] sale,account: currency formatting with taxes on reports

Uses the widget monetary to display the tax amounts the same way as the other amounts on the views.

Closes #14282
---
 addons/account/models/account_invoice.py     | 2 +-
 addons/account/views/report_invoice.xml      | 2 +-
 addons/sale/models/sale.py                   | 2 +-
 addons/sale/report/sale_report_templates.xml | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py
index a1ef9bf725d..aa6752e15b8 100644
--- a/addons/account/models/account_invoice.py
+++ b/addons/account/models/account_invoice.py
@@ -1118,7 +1118,7 @@ class AccountInvoice(models.Model):
             res.setdefault(line.tax_id.tax_group_id, 0.0)
             res[line.tax_id.tax_group_id] += line.amount
         res = sorted(res.items(), key=lambda l: l[0].sequence)
-        res = map(lambda l: (l[0].name, formatLang(self.env, l[1], currency_obj=currency)), res)
+        res = map(lambda l: (l[0].name, l[1]), res)
         return res
 
 
diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 75ff000446e..714fc350ac7 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -104,7 +104,7 @@
                             <tr>
                                 <td><span t-esc="amount_by_group[0]"/></td>
                                 <td class="text-right">
-                                    <span t-esc="amount_by_group[1]"/>
+                                    <span t-esc="amount_by_group[1]" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                                 </td>
                             </tr>
                         </t>
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index e9f61e877ba..dcadb512449 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -497,7 +497,7 @@ class SaleOrder(models.Model):
                 res.setdefault(group, 0.0)
                 res[group] += tax.compute_all(line.price_reduce, quantity=line.product_uom_qty)['taxes'][0]['amount']
         res = sorted(res.items(), key=lambda l: l[0].sequence)
-        res = map(lambda l: (l[0].name, formatLang(self.env, l[1], currency_obj=currency)), res)
+        res = map(lambda l: (l[0].name, l[1]), res)
         return res
 
 
diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml
index 7f251f798df..6d9c0b0c89c 100644
--- a/addons/sale/report/sale_report_templates.xml
+++ b/addons/sale/report/sale_report_templates.xml
@@ -139,7 +139,8 @@
                             <tr>
                                 <td><span t-esc="amount_by_group[0] or 'Taxes'"/></td>
                                 <td class="text-right">
-                                    <span t-esc="amount_by_group[1]"/>
+                                    <span t-esc="amount_by_group[1]"
+                                        t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
                                 </td>
                             </tr>
                         </t>