tocmo0nlord/Odoo-18.0-20251222
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account_financial_report: Open Items report now sorted by account code

Browse Source
This commit is contained in:
Alexis de Lattre
2024-10-24 15:34:43 +02:00
committed by chaule97
parent 50270b6e00
commit 2dad961ebb
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
account_financial_report/report/open_items.py
View File

@@ -206,11 +206,18 @@ class OpenItemsReport(models.AbstractModel):
@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 @@ class OpenItemsReport(models.AbstractModel):
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],
@@ -262,7 +269,10 @@ class OpenItemsReport(models.AbstractModel):
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],