diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py index 055c986a..a3849cfa 100644 --- a/account_financial_report/__manifest__.py +++ b/account_financial_report/__manifest__.py @@ -6,7 +6,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Account Financial Reports", - "version": "15.0.2.0.1", + "version": "15.0.2.1.0", "category": "Reporting", "summary": "OCA Financial Reports", "author": "Camptocamp SA," diff --git a/account_financial_report/i18n/account_financial_report.pot b/account_financial_report/i18n/account_financial_report.pot index 6ca635bf..8139d037 100644 --- a/account_financial_report/i18n/account_financial_report.pot +++ b/account_financial_report/i18n/account_financial_report.pot @@ -1144,7 +1144,7 @@ msgid "No limit" msgstr "" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/ar.po b/account_financial_report/i18n/ar.po index aed09bb3..256f6413 100644 --- a/account_financial_report/i18n/ar.po +++ b/account_financial_report/i18n/ar.po @@ -1155,7 +1155,7 @@ msgid "No limit" msgstr "" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/ca.po b/account_financial_report/i18n/ca.po index 5a7d58e5..b5c9ad06 100644 --- a/account_financial_report/i18n/ca.po +++ b/account_financial_report/i18n/ca.po @@ -1160,7 +1160,7 @@ msgid "No limit" msgstr "Sense l??mit" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/de.po b/account_financial_report/i18n/de.po index b4a9a42a..de323cfc 100644 --- a/account_financial_report/i18n/de.po +++ b/account_financial_report/i18n/de.po @@ -1173,7 +1173,7 @@ msgid "No limit" msgstr "Keine Einschr??nkung" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/es.po b/account_financial_report/i18n/es.po index 1681550a..deaedf34 100644 --- a/account_financial_report/i18n/es.po +++ b/account_financial_report/i18n/es.po @@ -1167,7 +1167,7 @@ msgid "No limit" msgstr "Sin l??mite" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "Ninguna" diff --git a/account_financial_report/i18n/es_AR.po b/account_financial_report/i18n/es_AR.po index 6d0ef756..dac24551 100644 --- a/account_financial_report/i18n/es_AR.po +++ b/account_financial_report/i18n/es_AR.po @@ -1166,7 +1166,7 @@ msgid "No limit" msgstr "Sin l??mite" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "Ninguno" diff --git a/account_financial_report/i18n/es_MX.po b/account_financial_report/i18n/es_MX.po index fd303f85..1feb387a 100644 --- a/account_financial_report/i18n/es_MX.po +++ b/account_financial_report/i18n/es_MX.po @@ -1137,7 +1137,7 @@ msgid "No limit" msgstr "" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/fr.po b/account_financial_report/i18n/fr.po index bfb1ded1..400456e1 100644 --- a/account_financial_report/i18n/fr.po +++ b/account_financial_report/i18n/fr.po @@ -1162,7 +1162,7 @@ msgid "No limit" msgstr "Sans limite" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/fr_CH.po b/account_financial_report/i18n/fr_CH.po index 30b876fd..a28c2655 100644 --- a/account_financial_report/i18n/fr_CH.po +++ b/account_financial_report/i18n/fr_CH.po @@ -1172,7 +1172,7 @@ msgid "No limit" msgstr "Sans limite" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/fr_FR.po b/account_financial_report/i18n/fr_FR.po index f73dd777..c82b72dd 100644 --- a/account_financial_report/i18n/fr_FR.po +++ b/account_financial_report/i18n/fr_FR.po @@ -1157,7 +1157,7 @@ msgid "No limit" msgstr "Sans limite" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/hr.po b/account_financial_report/i18n/hr.po index ead622f6..b7a0e9b7 100644 --- a/account_financial_report/i18n/hr.po +++ b/account_financial_report/i18n/hr.po @@ -1133,7 +1133,7 @@ msgid "No limit" msgstr "" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/hr_HR.po b/account_financial_report/i18n/hr_HR.po index 31040dc0..fa64cce4 100644 --- a/account_financial_report/i18n/hr_HR.po +++ b/account_financial_report/i18n/hr_HR.po @@ -1141,7 +1141,7 @@ msgid "No limit" msgstr "" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/it.po b/account_financial_report/i18n/it.po index 2e97b4fd..f7b7529f 100644 --- a/account_financial_report/i18n/it.po +++ b/account_financial_report/i18n/it.po @@ -1174,7 +1174,7 @@ msgid "No limit" msgstr "" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/ja.po b/account_financial_report/i18n/ja.po index 91bddc4d..0b888262 100644 --- a/account_financial_report/i18n/ja.po +++ b/account_financial_report/i18n/ja.po @@ -1134,7 +1134,7 @@ msgid "No limit" msgstr "" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/nl.po b/account_financial_report/i18n/nl.po index 9a6d2dcd..b2fb356e 100644 --- a/account_financial_report/i18n/nl.po +++ b/account_financial_report/i18n/nl.po @@ -1181,7 +1181,7 @@ msgid "No limit" msgstr "geen limiet" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/nl_NL.po b/account_financial_report/i18n/nl_NL.po index 2adc4c73..6a14f6b9 100644 --- a/account_financial_report/i18n/nl_NL.po +++ b/account_financial_report/i18n/nl_NL.po @@ -1140,7 +1140,7 @@ msgid "No limit" msgstr "" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/pt.po b/account_financial_report/i18n/pt.po index b5637013..b52bc4a5 100644 --- a/account_financial_report/i18n/pt.po +++ b/account_financial_report/i18n/pt.po @@ -1152,7 +1152,7 @@ msgid "No limit" msgstr "Sem limite" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/pt_BR.po b/account_financial_report/i18n/pt_BR.po index e3c5985b..7aa048bd 100644 --- a/account_financial_report/i18n/pt_BR.po +++ b/account_financial_report/i18n/pt_BR.po @@ -1179,7 +1179,7 @@ msgid "No limit" msgstr "Sem limite" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/i18n/ro.po b/account_financial_report/i18n/ro.po index 71920fbd..dbccc225 100644 --- a/account_financial_report/i18n/ro.po +++ b/account_financial_report/i18n/ro.po @@ -1158,7 +1158,7 @@ msgid "No limit" msgstr "Nicio limit??" #. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__none +#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__ msgid "None" msgstr "" diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py index 9fd54007..a4660072 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(