Merge PR #1387 into 18.0

Signed-off-by pedrobaeza

account_financial_report/README.rst

@@ -185,6 +185,9 @@ Contributors
 -  Saran Lim. <saranl@ecosoft.co.th>
 -  Omar Casti??eira <omar@comunitea.com>
 -  Chau Le <chaulb@trobz.com>
+-  `Stesi Consulting <https://www.stesi.consulting>`__:
+
+   -  Michele Di Croce <dicroce.m@stesi.consulting>
 
 Much of the work in this module was done at a sprint in Sorrento, Italy
 in April 2016.

account_financial_report/readme/CONTRIBUTORS.md

@@ -31,6 +31,8 @@
 - Saran Lim. \<<saranl@ecosoft.co.th>\>
 - Omar Casti??eira \<<omar@comunitea.com>\>
 - Chau Le \<<chaulb@trobz.com>\>
+- [Stesi Consulting](https://www.stesi.consulting):
+  - Michele Di Croce \<<dicroce.m@stesi.consulting>\>
   
 Much of the work in this module was done at a sprint in Sorrento, Italy
 in April 2016.

account_financial_report/report/trial_balance.py

@@ -194,7 +194,7 @@ class TrialBalanceReport(models.AbstractModel):
         initial_balances = self.env["account.move.line"].read_group(
             domain=domain,
             fields=["account_id", "balance", "amount_currency:sum"],
-            groupby=["account_id"],
+            groupby=["account_id", "currency_id"],
         )
         pl_initial_balance = 0.0
         pl_initial_currency_balance = 0.0
@@ -432,7 +432,7 @@ class TrialBalanceReport(models.AbstractModel):
             tb_initial_acc.append(
                 {"account_id": account.id, "balance": 0.0, "amount_currency": 0.0}
             )
-        groupby_fields = ["account_id"]
+        groupby_fields = ["account_id", "currency_id"]
         if grouped_by:
             groupby_fields.append("analytic_account_ids")
         initial_domain_bs = self._get_initial_balances_bs_ml_domain(
@@ -515,13 +515,13 @@ class TrialBalanceReport(models.AbstractModel):
             tb_initial_prt_bs = self.env["account.move.line"].read_group(
                 domain=initial_domain_bs,
                 fields=["account_id", "partner_id", "balance", "amount_currency:sum"],
-                groupby=["account_id", "partner_id"],
+                groupby=["account_id", "partner_id", "currency_id"],
                 lazy=False,
             )
             tb_initial_prt_pl = self.env["account.move.line"].read_group(
                 domain=initial_domain_pl,
                 fields=["account_id", "partner_id", "balance", "amount_currency:sum"],
-                groupby=["account_id", "partner_id"],
+                groupby=["account_id", "partner_id", "currency_id"],
             )
             tb_initial_prt = tb_initial_prt_bs + tb_initial_prt_pl
             if hide_account_at_0:
@@ -536,7 +536,7 @@ class TrialBalanceReport(models.AbstractModel):
                     "balance",
                     "amount_currency:sum",
                 ],
-                groupby=["account_id", "partner_id"],
+                groupby=["account_id", "currency_id", "partner_id"],
                 lazy=False,
             )
         total_amount = {}

account_financial_report/static/description/index.html

@@ -532,6 +532,10 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <li>Saran Lim. &lt;<a class="reference external" href="mailto:saranl&#64;ecosoft.co.th">saranl&#64;ecosoft.co.th</a>&gt;</li>
 <li>Omar Casti??eira &lt;<a class="reference external" href="mailto:omar&#64;comunitea.com">omar&#64;comunitea.com</a>&gt;</li>
 <li>Chau Le &lt;<a class="reference external" href="mailto:chaulb&#64;trobz.com">chaulb&#64;trobz.com</a>&gt;</li>
+<li><a class="reference external" href="https://www.stesi.consulting">Stesi Consulting</a>:<ul>
+<li>Michele Di Croce &lt;<a class="reference external" href="mailto:dicroce.m&#64;stesi.consulting">dicroce.m&#64;stesi.consulting</a>&gt;</li>
+</ul>
+</li>
 </ul>
 <p>Much of the work in this module was done at a sprint in Sorrento, Italy
 in April 2016.</p>