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

[FIX] account_financial_report: Show records in general ledger when not grouped.

pull/958/head
Víctor Martínez 2022-11-29 16:09:12 +01:00
parent 6a76bf861d
commit e23ec03a89
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
account_financial_report/report/general_ledger.py
View File

@ -436,6 +436,8 @@ class GeneralLedgerReport(models.AbstractModel):
res.append({"id": tax_item.id, "name": tax_item.name}) res.append({"id": tax_item.id, "name": tax_item.name})
else: else:
res.append({"id": 0, "name": "Missing Tax"}) res.append({"id": 0, "name": "Missing Tax"})
else:
res.append({"id": 0, "name": ""})
return res return res
def _get_period_ml_data( def _get_period_ml_data(
@ -519,12 +521,14 @@ class GeneralLedgerReport(models.AbstractModel):
gen_ld_data[acc_id] = self._initialize_data(foreign_currency) gen_ld_data[acc_id] = self._initialize_data(foreign_currency)
gen_ld_data[acc_id]["id"] = acc_id gen_ld_data[acc_id]["id"] = acc_id
gen_ld_data[acc_id]["mame"] = move_line["account_id"][1] gen_ld_data[acc_id]["mame"] = move_line["account_id"][1]
if grouped_by:
gen_ld_data[acc_id][grouped_by] = False gen_ld_data[acc_id][grouped_by] = False
if acc_id in acc_prt_account_ids: if acc_id in acc_prt_account_ids:
item_ids = self._prepare_ml_items(move_line, grouped_by) item_ids = self._prepare_ml_items(move_line, grouped_by)
for item in item_ids: for item in item_ids:
item_id = item["id"] item_id = item["id"]
if item_id not in gen_ld_data[acc_id]: if item_id not in gen_ld_data[acc_id]:
if grouped_by:
gen_ld_data[acc_id][grouped_by] = True gen_ld_data[acc_id][grouped_by] = True
gen_ld_data[acc_id][item_id] = self._initialize_data( gen_ld_data[acc_id][item_id] = self._initialize_data(
foreign_currency foreign_currency

2
account_financial_report/wizard/general_ledger_wizard.py
View File

@ -78,7 +78,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
help="Ending account in a range", help="Ending account in a range",
) )
grouped_by = fields.Selection( grouped_by = fields.Selection(
selection=[("none", "None"), ("partners", "Partners"), ("taxes", "Taxes")], selection=[("", "None"), ("partners", "Partners"), ("taxes", "Taxes")],
default="partners", default="partners",
) )
show_cost_center = fields.Boolean( show_cost_center = fields.Boolean(