Skip to content

Commit

Permalink
[FIX] account_financial_report: Open Items report now sorted by accou…
Browse files Browse the repository at this point in the history
…nt code
  • Loading branch information
alexis-via committed Oct 24, 2024
1 parent a31dcd7 commit 909e4b6
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions account_financial_report/report/open_items.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,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]:
Expand All @@ -228,7 +235,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],
Expand Down Expand Up @@ -279,7 +286,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],
Expand Down

0 comments on commit 909e4b6

Please sign in to comment.