Merge PR #1240 into 16.0

Signed-off-by alexis-via
OCA · Oct 30, 2024 · b20d370 · b20d370
2 parents f8f5ec1 + 88c2503
commit b20d370
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/account_financial_report/report/abstract_report_xlsx.py b/account_financial_report/report/abstract_report_xlsx.py
@@ -496,7 +496,7 @@ def write_ending_balance_from_dict(self, my_object, name, label, report_data):
                         report_data["formats"]["format_header_amount"],
                     )
                 elif cell_type == "amount_currency":
-                    if my_object["currency_id"] and value:
+                    if my_object["currency_id"]:
                         format_amt = self._get_currency_amt_format_dict(
                             my_object, report_data
                         )
@@ -597,9 +597,8 @@ def _get_currency_amt_header_format_dict(self, line_object, report_data):
                     {"bold": True, "border": True, "bg_color": "#FFFFCC"}
                 )
                 report_data["field_name"] = format_amt
-                format_amount = "#,##0." + (
-                    "0" * line_object["currency_id"].decimal_places
-                )
+                currency = self.env["res.currency"].browse(line_object["currency_id"])
+                format_amount = "#,##0." + ("0" * currency.decimal_places)
                 format_amt.set_num_format(format_amount)
         return format_amt
 

diff --git a/account_financial_report/report/open_items.py b/account_financial_report/report/open_items.py
@@ -206,11 +206,18 @@ def _calculate_amounts(self, open_items_move_lines_data):
 
     @api.model
     def _order_open_items_by_date(
-        self, open_items_move_lines_data, show_partner_details, partners_data
+        self,
+        open_items_move_lines_data,
+        show_partner_details,
+        partners_data,
+        accounts_data,
     ):
+        # We need to order by account code, partner_name and date
+        accounts_data_sorted = sorted(accounts_data.items(), key=lambda x: x[1]["code"])
+        account_ids_sorted = [account[0] for account in accounts_data_sorted]
         new_open_items = {}
         if not show_partner_details:
-            for acc_id in open_items_move_lines_data.keys():
+            for acc_id in account_ids_sorted:
                 new_open_items[acc_id] = {}
                 move_lines = []
                 for prt_id in open_items_move_lines_data[acc_id]:
@@ -219,7 +226,7 @@ def _order_open_items_by_date(
                 move_lines = sorted(move_lines, key=lambda k: (k["date"]))
                 new_open_items[acc_id] = move_lines
         else:
-            for acc_id in open_items_move_lines_data.keys():
+            for acc_id in account_ids_sorted:
                 new_open_items[acc_id] = {}
                 for prt_id in sorted(
                     open_items_move_lines_data[acc_id],
@@ -265,7 +272,10 @@ def _get_report_values(self, docids, data):
 
         total_amount = self._calculate_amounts(open_items_move_lines_data)
         open_items_move_lines_data = self._order_open_items_by_date(
-            open_items_move_lines_data, show_partner_details, partners_data
+            open_items_move_lines_data,
+            show_partner_details,
+            partners_data,
+            accounts_data,
         )
         return {
             "doc_ids": [wizard_id],

diff --git a/account_financial_report/report/trial_balance.py b/account_financial_report/report/trial_balance.py
@@ -270,6 +270,9 @@ def _compute_acc_prt_amount(
                 total_amount[acc_id][prt_id]["ending_currency_balance"] += round(
                     tb["amount_currency"], 2
                 )
+        total_amount[acc_id][prt_id]["partner_name"] = (
+            tb["partner_id"][1] if tb["partner_id"] else _("Missing Partner")
+        )
         return total_amount
 
     @api.model
@@ -293,6 +296,7 @@ def _compute_partner_amount(
             total_amount[acc_id][prt_id]["debit"] = tb["debit"]
             total_amount[acc_id][prt_id]["balance"] = tb["balance"]
             total_amount[acc_id][prt_id]["initial_balance"] = 0.0
+            total_amount[acc_id][prt_id]["partner_name"] = partners_data[prt_id]["name"]
             partners_ids.add(prt_id)
         for tb in tb_initial_prt:
             acc_id = tb["account_id"][0]
@@ -305,6 +309,18 @@ def _compute_partner_amount(
             total_amount = self._compute_acc_prt_amount(
                 total_amount, tb, acc_id, prt_id, foreign_currency
             )
+        # sort on partner_name
+        for acc_id, total_data in total_amount.items():
+            tmp_list = sorted(
+                total_data.items(),
+                key=lambda x: isinstance(x[0], int)
+                and isinstance(x[1], dict)
+                and x[1]["partner_name"]
+                or x[0],
+            )
+            total_amount[acc_id] = {}
+            for key, value in tmp_list:
+                total_amount[acc_id][key] = value
         return total_amount, partners_data
 
     def _remove_accounts_at_cero(self, total_amount, show_partner_details, company):