tocmo0nlord/Odoo-18.0-20251222
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Víctor Martínez
2022-11-29 16:09:12 +01:00
committed by chaule97
parent f41e8a6bc2
commit 5868931866
22 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_financial_report/__manifest__.py
View File

@@ -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,"

2
account_financial_report/i18n/account_financial_report.pot
View File

@@ -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 ""

2
account_financial_report/i18n/ar.po
View File

@@ -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 ""

2
account_financial_report/i18n/ca.po
View File

@@ -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 ""

2
account_financial_report/i18n/de.po
View File

@@ -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 ""

2
account_financial_report/i18n/es.po
View File

@@ -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"

2
account_financial_report/i18n/es_AR.po
View File

@@ -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"

2
account_financial_report/i18n/es_MX.po
View File

@@ -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 ""

2
account_financial_report/i18n/fr.po
View File

@@ -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 ""

2
account_financial_report/i18n/fr_CH.po
View File

@@ -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 ""

2
account_financial_report/i18n/fr_FR.po
View File

@@ -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 ""

2
account_financial_report/i18n/hr.po
View File

@@ -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 ""

2
account_financial_report/i18n/hr_HR.po
View File

@@ -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 ""

2
account_financial_report/i18n/it.po
View File

@@ -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 ""

2
account_financial_report/i18n/ja.po
View File

@@ -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 ""

2
account_financial_report/i18n/nl.po
View File

@@ -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 ""

2
account_financial_report/i18n/nl_NL.po
View File

@@ -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 ""

2
account_financial_report/i18n/pt.po
View File

@@ -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 ""

2
account_financial_report/i18n/pt_BR.po
View File

@@ -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 ""

2
account_financial_report/i18n/ro.po
View File

@@ -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 ""

8
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})
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
)

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",
)
grouped_by = fields.Selection(
selection=[("none", "None"), ("partners", "Partners"), ("taxes", "Taxes")],
selection=[("", "None"), ("partners", "Partners"), ("taxes", "Taxes")],
default="partners",
)
show_cost_center = fields.Boolean(