From 2cc2ad2438e83459427c6186a17c780f5677835b Mon Sep 17 00:00:00 2001
From: Akim Juillerat <akim.juillerat@camptocamp.com>
Date: Wed, 11 Mar 2020 16:54:43 +0100
Subject: [PATCH 1/2] account_financial_report: Increase columns width in
 general ledger Before this commit, amounts such as "10'000.00 CHF" were
 exceeding their columns width. Label column could be reduced as it's printed
 correctly over two different lines.

---
 .../report/templates/general_ledger.xml       | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml
index cf1f13cb..29ec1f20 100644
--- a/account_financial_report/report/templates/general_ledger.xml
+++ b/account_financial_report/report/templates/general_ledger.xml
@@ -156,7 +156,7 @@
                     <div class="act_as_cell" style="width: 12.01%;">Partner
                     </div>
                     <!--## ref - label-->
-                    <div class="act_as_cell" style="width: 22.9%;">Ref -
+                    <div class="act_as_cell" style="width: 16.9%;">Ref -
                         Label</div>
                     <t t-if="show_cost_center">
                         <!--## cost_center-->
@@ -170,14 +170,11 @@
                     <!--## matching_number-->
                     <div class="act_as_cell" style="width: 2.41%;">Rec.</div>
                     <!--## debit-->
-                    <div class="act_as_cell amount" style="width: 6.02%;">Debit</div>
+                    <div class="act_as_cell amount" style="width: 8.02%;">Debit</div>
                     <!--## credit-->
-                    <div class="act_as_cell amount" style="width: 6.02%;">Credit</div>
+                    <div class="act_as_cell amount" style="width: 8.02%;">Credit</div>
                     <!--## balance cumulated-->
-                    <div
-                        class="act_as_cell amount"
-                        style="width: 6.02%;"
-                    >Cumul. Bal.</div>
+                    <div class="act_as_cell amount" style="width: 8.02%;">Cumul. Bal.</div>
                     <t t-if="foreign_currency">
                         <!--## currency_name-->
                         <div class="act_as_cell" style="width: 2.08%;">Cur.</div>
@@ -730,17 +727,12 @@
                         /> - <span
                             t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'name')"
                         /></div>
-                    <div
-                        class="act_as_cell right"
-                        style="width: 22.9%;"
-                    >Ending balance</div>
+                    <div class="act_as_cell right"
+                         style="width: 16.9%;">Ending balance</div>
                 </t>
                 <t t-if='type == "partner_type"'>
-                    <div class="act_as_cell first_column" style="width: 41.32%;" />
-                    <div
-                        class="act_as_cell right"
-                        style="width: 22.9%;"
-                    >Partner ending balance</div>
+                    <div class="act_as_cell first_column" style="width: 41.32%;"/>
+                    <div class="act_as_cell right" style="width: 16.9%;">Partner ending balance</div>
                 </t>
                 <t t-if="show_cost_center">
                     <!--## cost_center-->
@@ -753,21 +745,21 @@
                 <!--## matching_number-->
                 <div class="act_as_cell" style="width: 2.41%;" />
                 <!--## debit-->
-                <div class="act_as_cell amount" style="width: 6.02%;">
+                <div class="act_as_cell amount" style="width: 8.02%;">
                     <span
                         t-esc="account_or_partner_object['fin_bal']['debit']"
                         t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                     />
                 </div>
                 <!--## credit-->
-                <div class="act_as_cell amount" style="width: 6.02%;">
+                <div class="act_as_cell amount" style="width: 8.02%;">
                     <span
                         t-esc="account_or_partner_object['fin_bal']['credit']"
                         t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
                     />
                 </div>
                 <!--## balance cumulated-->
-                <div class="act_as_cell amount" style="width: 6.02%;">
+                <div class="act_as_cell amount" style="width: 8.02%;">
                     <span
                         t-esc="account_or_partner_object['fin_bal']['balance']"
                         t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"

From b8cdb0fcea7a6263ceaf17ff1e0b9ee2017e72d6 Mon Sep 17 00:00:00 2001
From: Tonow-c2c <thomas.nowicki@camptocamp.com>
Date: Wed, 6 May 2020 15:26:28 +0200
Subject: [PATCH 2/2] fixup! account_financial_report: Increase columns width
 in general ledger Before this commit, amounts such as "10'000.00 CHF" were
 exceeding their columns width. Label column could be reduced as it's printed
 correctly over two different lines.

---
 .../report/templates/general_ledger.xml        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml
index 29ec1f20..06444e7d 100644
--- a/account_financial_report/report/templates/general_ledger.xml
+++ b/account_financial_report/report/templates/general_ledger.xml
@@ -174,7 +174,10 @@
                     <!--## credit-->
                     <div class="act_as_cell amount" style="width: 8.02%;">Credit</div>
                     <!--## balance cumulated-->
-                    <div class="act_as_cell amount" style="width: 8.02%;">Cumul. Bal.</div>
+                    <div
+                        class="act_as_cell amount"
+                        style="width: 8.02%;"
+                    >Cumul. Bal.</div>
                     <t t-if="foreign_currency">
                         <!--## currency_name-->
                         <div class="act_as_cell" style="width: 2.08%;">Cur.</div>
@@ -727,12 +730,17 @@
                         /> - <span
                             t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'name')"
                         /></div>
-                    <div class="act_as_cell right"
-                         style="width: 16.9%;">Ending balance</div>
+                    <div
+                        class="act_as_cell right"
+                        style="width: 16.9%;"
+                    >Ending balance</div>
                 </t>
                 <t t-if='type == "partner_type"'>
-                    <div class="act_as_cell first_column" style="width: 41.32%;"/>
-                    <div class="act_as_cell right" style="width: 16.9%;">Partner ending balance</div>
+                    <div class="act_as_cell first_column" style="width: 41.32%;" />
+                    <div
+                        class="act_as_cell right"
+                        style="width: 16.9%;"
+                    >Partner ending balance</div>
                 </t>
                 <t t-if="show_cost_center">
                     <!--## cost_center-->