diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py index 8981d89f..c0bf529d 100644 --- a/account_financial_report/report/general_ledger.py +++ b/account_financial_report/report/general_ledger.py @@ -436,6 +436,8 @@ class GeneralLedgerReport(models.AbstractModel): res.append({"id": tax_item.id, "name": tax_item.name}) else: res.append({"id": 0, "name": "Missing Tax"}) + else: + res.append({"id": 0, "name": ""}) return res def _get_period_ml_data( @@ -519,13 +521,15 @@ class GeneralLedgerReport(models.AbstractModel): gen_ld_data[acc_id] = self._initialize_data(foreign_currency) gen_ld_data[acc_id]["id"] = acc_id gen_ld_data[acc_id]["mame"] = move_line["account_id"][1] - gen_ld_data[acc_id][grouped_by] = False + if grouped_by: + gen_ld_data[acc_id][grouped_by] = False if acc_id in acc_prt_account_ids: item_ids = self._prepare_ml_items(move_line, grouped_by) for item in item_ids: item_id = item["id"] if item_id not in gen_ld_data[acc_id]: - gen_ld_data[acc_id][grouped_by] = True + if grouped_by: + gen_ld_data[acc_id][grouped_by] = True gen_ld_data[acc_id][item_id] = self._initialize_data( foreign_currency ) diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py index 0fd2598f..5eb1edf5 100644 --- a/account_financial_report/wizard/general_ledger_wizard.py +++ b/account_financial_report/wizard/general_ledger_wizard.py @@ -78,7 +78,7 @@ class GeneralLedgerReportWizard(models.TransientModel): help="Ending account in a range", ) grouped_by = fields.Selection( - selection=[("none", "None"), ("partners", "Partners"), ("taxes", "Taxes")], + selection=[("", "None"), ("partners", "Partners"), ("taxes", "Taxes")], default="partners", ) show_cost_center = fields.Boolean(