Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #963 into 15.0 

Signed-off-by pedrobaeza
pull/965/head
OCA-git-bot 2022-12-07 12:29:54 +00:00
parent 83f2451f62 b2a8ba5edd
commit e7082c3ea8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
account_financial_report/report/open_items.py
View File

@ -197,7 +197,7 @@ class OpenItemsReport(models.AbstractModel):
@api.model @api.model
def _order_open_items_by_date( def _order_open_items_by_date(
self, open_items_move_lines_data, show_partner_details self, open_items_move_lines_data, show_partner_details, partners_data
): ):
new_open_items = {} new_open_items = {}
if not show_partner_details: if not show_partner_details:
@ -212,7 +212,10 @@ class OpenItemsReport(models.AbstractModel):
else: else:
for acc_id in open_items_move_lines_data.keys(): for acc_id in open_items_move_lines_data.keys():
new_open_items[acc_id] = {} new_open_items[acc_id] = {}
for prt_id in open_items_move_lines_data[acc_id]: for prt_id in sorted(
open_items_move_lines_data[acc_id],
key=lambda i: partners_data[i]["name"],
):
new_open_items[acc_id][prt_id] = {} new_open_items[acc_id][prt_id] = {}
move_lines = [] move_lines = []
for move_line in open_items_move_lines_data[acc_id][prt_id]: for move_line in open_items_move_lines_data[acc_id][prt_id]:
@ -250,7 +253,7 @@ class OpenItemsReport(models.AbstractModel):
total_amount = self._calculate_amounts(open_items_move_lines_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 = self._order_open_items_by_date(
open_items_move_lines_data, show_partner_details open_items_move_lines_data, show_partner_details, partners_data
) )
return { return {
"doc_ids": [wizard_id], "doc_ids": [wizard_id],