From 53574b8b2ab5042a51eca7ea503cbefe7c355e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Thu, 1 Sep 2022 12:57:33 +0200
Subject: [PATCH] [IMP] account_financial_report: Remove "Cur." column
 (currency is now added in "Amount cur.") from general_ledger. TT38722

---
 .../report/general_ledger.py                  |  1 +
 .../report/templates/general_ledger.xml       | 49 +++++++------------
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py
index a3e169ef..05953717 100644
--- a/account_financial_report/report/general_ledger.py
+++ b/account_financial_report/report/general_ledger.py
@@ -859,4 +859,5 @@ class GeneralLedgerReport(models.AbstractModel):
             "centralize": centralize,
             "tags_data": tags_data,
             "filter_partner_ids": filter_partner_ids,
+            "currency_model": self.env["res.currency"],
         }
diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml
index bc48f130..83d78845 100644
--- a/account_financial_report/report/templates/general_ledger.xml
+++ b/account_financial_report/report/templates/general_ledger.xml
@@ -188,12 +188,11 @@
                         Cumul. Bal.
                     </div>
                     <t t-if="foreign_currency">
-                        <!--## currency_name-->
-                        <div class="act_as_cell" style="width: 2.08%;">Cur.</div>
                         <!--## amount_currency-->
-                        <div class="act_as_cell amount" style="width: 5.19%;">
-                            Amount cur.
-                        </div>
+                        <div
+                            class="act_as_cell amount"
+                            style="width: 7.27%;"
+                        >Amount cur.</div>
                     </t>
                 </div>
             </div>
@@ -321,12 +320,7 @@
                     <t
                         t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
                     >
-                        <div class="act_as_cell amount" style="width: 2.08%;">
-                            <span
-                                t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
-                            />
-                        </div>
-                        <div class="act_as_cell amount" style="width: 5.19%;">
+                        <div class="act_as_cell amount" style="width: 7.27%;">
                             <t t-if="type == 'account_type'">
                                 <t
                                     t-set="domain"
@@ -365,8 +359,7 @@
                     <t
                         t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
                     >
-                        <div class="act_as_cell" style="width: 2.08%;" />
-                        <div class="act_as_cell" style="width: 5.19%;" />
+                        <div class="act_as_cell" style="width: 7.27%;" />
                     </t>
                 </t>
             </div>
@@ -583,26 +576,24 @@
                     </div>
                     <t t-if="foreign_currency">
                         <t t-if="line['currency_id']">
-                            <!--## currency_name-->
-                            <div class="act_as_cell amount" style="width: 2.08%;">
-                                <span t-esc="line['currency_id'][1]" />
-                            </div>
                             <!--## amount_currency-->
-                            <div class="act_as_cell amount" style="width: 5.19%;">
+                            <div class="act_as_cell amount" style="width: 7.27%;">
+                                <t
+                                    t-set="line_currency"
+                                    t-value="currency_model.browse(line['currency_id'][0])"
+                                />
                                 <span
                                     t-att-res-id="line['id']"
                                     res-model="account.move.line"
                                     view-type="form"
-                                >
-                                    <t t-raw="line['bal_curr']" />
-                                </span>
+                                    t-raw="line['bal_curr']"
+                                    t-options="{'widget': 'monetary', 'display_currency': line_currency}"
+                                />
                             </div>
                         </t>
                         <t t-if="not line['currency_id']">
-                            <!--## currency_name-->
-                            <div class="act_as_cell amount" style="width: 2.08%;" />
                             <!--## amount_currency-->
-                            <div class="act_as_cell amount" style="width: 5.19%;" />
+                            <div class="act_as_cell amount" style="width: 7.27%;" />
                         </t>
                     </t>
                 </div>
@@ -670,12 +661,7 @@
                     <t
                         t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
                     >
-                        <div class="act_as_cell amount" style="width: 2.08%;">
-                            <span
-                                t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
-                            />
-                        </div>
-                        <div class="act_as_cell amount" style="width: 5.19%;">
+                        <div class="act_as_cell amount" style="width: 7.27%;">
                             <t t-if="type == 'account_type'">
                                 <t
                                     t-set="domain"
@@ -722,8 +708,7 @@
                     <t
                         t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
                     >
-                        <div class="act_as_cell amount" style="width: 2.08%;" />
-                        <div class="act_as_cell amount" style="width: 5.19%;" />
+                        <div class="act_as_cell amount" style="width: 7.27%;" />
                     </t>
                 </t>
             </div>