From 4af9e021a7c4ccf88608438c74947ede6316f449 Mon Sep 17 00:00:00 2001 From: Ernesto Tejeda Date: Tue, 31 May 2022 00:14:19 -0400 Subject: [PATCH] [IMP] account_financial_report: Remove 'Computed Accounts' option from 'trial balance'. --- account_financial_report/__manifest__.py | 2 +- .../i18n/account_financial_report.pot | 42 +--- account_financial_report/i18n/ar.po | 57 ++--- account_financial_report/i18n/ca.po | 55 ++--- account_financial_report/i18n/de.po | 55 ++--- account_financial_report/i18n/es.po | 83 +++---- account_financial_report/i18n/es_AR.po | 83 +++---- account_financial_report/i18n/es_MX.po | 43 +--- account_financial_report/i18n/fr.po | 85 ++++---- account_financial_report/i18n/fr_CH.po | 85 ++++---- account_financial_report/i18n/fr_FR.po | 85 ++++---- account_financial_report/i18n/hr.po | 43 +--- account_financial_report/i18n/hr_HR.po | 43 +--- account_financial_report/i18n/it.po | 83 +++---- account_financial_report/i18n/ja.po | 43 +--- account_financial_report/i18n/nl.po | 55 ++--- account_financial_report/i18n/nl_NL.po | 43 +--- account_financial_report/i18n/pt.po | 84 ++++---- account_financial_report/i18n/pt_BR.po | 82 +++---- account_financial_report/i18n/ro.po | 55 ++--- .../report/templates/trial_balance.xml | 52 +---- .../report/trial_balance.py | 16 +- .../report/trial_balance_xlsx.py | 12 +- .../tests/test_trial_balance.py | 204 +----------------- .../wizard/trial_balance_wizard.py | 24 +-- .../wizard/trial_balance_wizard_view.xml | 5 +- 26 files changed, 544 insertions(+), 975 deletions(-) diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py index 7c35102e..0c03257b 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.1.2", + "version": "15.0.2.2.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 8139d037..5a595dc5 100644 --- a/account_financial_report/i18n/account_financial_report.pot +++ b/account_financial_report/i18n/account_financial_report.pot @@ -376,11 +376,6 @@ msgstr "" msgid "Centralized" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -413,23 +408,6 @@ msgstr "" msgid "Compute accounts" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any grouping.\n" -" " -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -925,11 +903,6 @@ msgstr "" msgid "Hierarchy Levels to display" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1131,11 +1104,6 @@ msgstr "" msgid "No group" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1443,6 +1411,11 @@ msgstr "" msgid "Show foreign currency" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1674,6 +1647,11 @@ msgid "" "trial balance." msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html diff --git a/account_financial_report/i18n/ar.po b/account_financial_report/i18n/ar.po index 256f6413..9adcc9fc 100644 --- a/account_financial_report/i18n/ar.po +++ b/account_financial_report/i18n/ar.po @@ -380,11 +380,6 @@ msgstr "?????????? ????????????" msgid "Centralized" msgstr "??????????" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "???????????? ??????????" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -418,24 +413,6 @@ msgstr "??????????????" msgid "Compute accounts" msgstr "???????????? ????????????" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "???????????? ????????????" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -935,11 +912,6 @@ msgstr "?????????? ???????????????? ?????????? ??????" msgid "Hierarchy Levels to display" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "???????????? ?????????? ??????" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1141,12 +1113,6 @@ msgstr "????" msgid "No group" msgstr "???????? ??????????" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -#, fuzzy -msgid "No hierarchy" -msgstr "???????????? ?????????? ??????" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1454,6 +1420,11 @@ msgstr "" msgid "Show foreign currency" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1688,6 +1659,11 @@ msgid "" "balance." msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1819,6 +1795,19 @@ msgstr "" msgid "width: 8.11%;" msgstr "" +#~ msgid "Child Accounts" +#~ msgstr "???????????? ??????????" + +#~ msgid "Computed Accounts" +#~ msgstr "???????????? ????????????" + +#~ msgid "Hierarchy On" +#~ msgstr "???????????? ?????????? ??????" + +#, fuzzy +#~ msgid "No hierarchy" +#~ msgstr "???????????? ?????????? ??????" + #~ msgid "From: %s To: %s" #~ msgstr "????: %s ??????: %s" diff --git a/account_financial_report/i18n/ca.po b/account_financial_report/i18n/ca.po index b5c9ad06..1ace782b 100644 --- a/account_financial_report/i18n/ca.po +++ b/account_financial_report/i18n/ca.po @@ -386,11 +386,6 @@ msgstr "" msgid "Centralized" msgstr "Centralitzat" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Comptes fill" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -423,24 +418,6 @@ msgstr "Empresa " msgid "Compute accounts" msgstr "Calcula comptes" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Comptes calculats" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -939,11 +916,6 @@ msgstr "Amaga comptes a 0" msgid "Hierarchy Levels to display" msgstr "Nivells de jerarquia a mostrar" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Jerarquia en" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1147,11 +1119,6 @@ msgstr "No" msgid "No group" msgstr "Sense grup" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "Sense jerarquia" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1457,6 +1424,11 @@ msgstr "Mostrar etiquetes anal??tiques" msgid "Show foreign currency" msgstr "Mostrar divisa estrangera" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1699,6 +1671,11 @@ msgid "" "balance." msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1833,6 +1810,18 @@ msgstr "ample: 38.92%;" msgid "width: 8.11%;" msgstr "ample: 8.11%;" +#~ msgid "Child Accounts" +#~ msgstr "Comptes fill" + +#~ msgid "Computed Accounts" +#~ msgstr "Comptes calculats" + +#~ msgid "Hierarchy On" +#~ msgstr "Jerarquia en" + +#~ msgid "No hierarchy" +#~ msgstr "Sense jerarquia" + #~ msgid "From: %s To: %s" #~ msgstr "Des de: %s A: %s" diff --git a/account_financial_report/i18n/de.po b/account_financial_report/i18n/de.po index de323cfc..448a076c 100644 --- a/account_financial_report/i18n/de.po +++ b/account_financial_report/i18n/de.po @@ -395,11 +395,6 @@ msgstr "Zusammenfassung Filter" msgid "Centralized" msgstr "Zusammengefasst" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Unterkonto" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -433,24 +428,6 @@ msgstr "Unternehmen" msgid "Compute accounts" msgstr "Berechnete Konten" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Berechnete Konten" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -954,11 +931,6 @@ msgstr "Ausgeglichene Konten ausblenden" msgid "Hierarchy Levels to display" msgstr "Anzuzeigende Ebenen" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Gruppieren ??ber" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1160,11 +1132,6 @@ msgstr "Nein" msgid "No group" msgstr "Keine Gruppierung" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "Keine Ebenen" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1478,6 +1445,11 @@ msgstr "Kostenstichw??rter anzeigen" msgid "Show foreign currency" msgstr "Fremdw??hrung anzeigen" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option #, fuzzy @@ -1723,6 +1695,11 @@ msgstr "" "verbergen. Sind Partner ausgeblendet, werden Soll- und Habensummen nicht dem " "Stichtagssaldo entsprechen." +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1860,6 +1837,18 @@ msgstr "Breite: 38.92%;" msgid "width: 8.11%;" msgstr "Breite: 8,11%;" +#~ msgid "Child Accounts" +#~ msgstr "Unterkonto" + +#~ msgid "Computed Accounts" +#~ msgstr "Berechnete Konten" + +#~ msgid "Hierarchy On" +#~ msgstr "Gruppieren ??ber" + +#~ msgid "No hierarchy" +#~ msgstr "Keine Ebenen" + #~ msgid "From: %s To: %s" #~ msgstr "Von: %s Bis: %s" diff --git a/account_financial_report/i18n/es.po b/account_financial_report/i18n/es.po index deaedf34..e6ea4eab 100644 --- a/account_financial_report/i18n/es.po +++ b/account_financial_report/i18n/es.po @@ -384,11 +384,6 @@ msgstr "Centralizar el filtro" msgid "Centralized" msgstr "Centralizado" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Cuentas Hijas" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -421,32 +416,6 @@ msgstr "Compa????a" msgid "Compute accounts" msgstr "Cuentas calculadas" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Cuentas Calculadas" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" -"Cuentas Calculadas: Usar cuando el grupo de cuentas tiene c??digos \n" -" que representan prefijos de las cuentas reales.\n" -"\n" -" Cuentas Hijas: Usar cuando los grupos de cuentas son jer??rquicos.\n" -"\n" -" Sin jerarqu??a: Usar para mostrar s??lo las cuentas, sin ninguna " -"agrupaci??n.\n" -" " - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -947,11 +916,6 @@ msgstr "Ocultar cuentas a 0" msgid "Hierarchy Levels to display" msgstr "Niveles de Jerarqu??a a mostrar" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Jerarqu??a en" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1154,11 +1118,6 @@ msgstr "No" msgid "No group" msgstr "Sin grupo" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "Sin jerarqu??a" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1463,6 +1422,11 @@ msgstr "Mostrar etiquetas anal??ticas" msgid "Show foreign currency" msgstr "Mostrar Moneda Extranjera" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1707,6 +1671,11 @@ msgstr "" "las empresas se filtran, los debe y haber totales no coincidir??n con el " "balance de sumas y saldos." +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1839,3 +1808,35 @@ msgstr "ancho: 38.92%;" #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header msgid "width: 8.11%;" msgstr "ancho: 8.11%;" + +#~ msgid "Child Accounts" +#~ msgstr "Cuentas Hijas" + +#~ msgid "Computed Accounts" +#~ msgstr "Cuentas Calculadas" + +#~ msgid "" +#~ "Computed Accounts: Use when the account group have codes\n" +#~ " that represent prefixes of the actual accounts.\n" +#~ "\n" +#~ " Child Accounts: Use when your account groups are hierarchical.\n" +#~ "\n" +#~ " No hierarchy: Use to display just the accounts, without any " +#~ "grouping.\n" +#~ " " +#~ msgstr "" +#~ "Cuentas Calculadas: Usar cuando el grupo de cuentas tiene c??digos \n" +#~ " que representan prefijos de las cuentas reales.\n" +#~ "\n" +#~ " Cuentas Hijas: Usar cuando los grupos de cuentas son " +#~ "jer??rquicos.\n" +#~ "\n" +#~ " Sin jerarqu??a: Usar para mostrar s??lo las cuentas, sin ninguna " +#~ "agrupaci??n.\n" +#~ " " + +#~ msgid "Hierarchy On" +#~ msgstr "Jerarqu??a en" + +#~ msgid "No hierarchy" +#~ msgstr "Sin jerarqu??a" diff --git a/account_financial_report/i18n/es_AR.po b/account_financial_report/i18n/es_AR.po index dac24551..dfc543c7 100644 --- a/account_financial_report/i18n/es_AR.po +++ b/account_financial_report/i18n/es_AR.po @@ -383,11 +383,6 @@ msgstr "Centralizar el filtro" msgid "Centralized" msgstr "Centralizado" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Cuentas Hijas" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -420,32 +415,6 @@ msgstr "Compa????a" msgid "Compute accounts" msgstr "Cuentas calculadas" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Cuentas Calculadas" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" -"Cuentas Calculadas: Usar cuando el grupo de cuentas tiene c??digos \n" -" que representan prefijos de las cuentas reales.\n" -"\n" -" Cuentas Hijas: Usar cuando los grupos de cuentas son jer??rquicos.\n" -"\n" -" Sin jerarqu??a: Usar para mostrar s??lo las cuentas, sin ninguna " -"agrupaci??n.\n" -" " - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -946,11 +915,6 @@ msgstr "Ocultar cuentas a 0" msgid "Hierarchy Levels to display" msgstr "Niveles de Jerarqu??a a mostrar" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Jerarqu??a en" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1153,11 +1117,6 @@ msgstr "No" msgid "No group" msgstr "Sin grupo" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "Sin jerarqu??a" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1466,6 +1425,11 @@ msgstr "Mostrar etiquetas anal??ticas" msgid "Show foreign currency" msgstr "Mostrar Moneda Extranjera" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1711,6 +1675,11 @@ msgstr "" "las empresas se filtran, los debe y haber totales no coincidir??n con el " "balance de sumas y saldos." +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1844,6 +1813,38 @@ msgstr "ancho: 38.92%;" msgid "width: 8.11%;" msgstr "ancho: 8.11%;" +#~ msgid "Child Accounts" +#~ msgstr "Cuentas Hijas" + +#~ msgid "Computed Accounts" +#~ msgstr "Cuentas Calculadas" + +#~ msgid "" +#~ "Computed Accounts: Use when the account group have codes\n" +#~ " that represent prefixes of the actual accounts.\n" +#~ "\n" +#~ " Child Accounts: Use when your account groups are hierarchical.\n" +#~ "\n" +#~ " No hierarchy: Use to display just the accounts, without any " +#~ "grouping.\n" +#~ " " +#~ msgstr "" +#~ "Cuentas Calculadas: Usar cuando el grupo de cuentas tiene c??digos \n" +#~ " que representan prefijos de las cuentas reales.\n" +#~ "\n" +#~ " Cuentas Hijas: Usar cuando los grupos de cuentas son " +#~ "jer??rquicos.\n" +#~ "\n" +#~ " Sin jerarqu??a: Usar para mostrar s??lo las cuentas, sin ninguna " +#~ "agrupaci??n.\n" +#~ " " + +#~ msgid "Hierarchy On" +#~ msgstr "Jerarqu??a en" + +#~ msgid "No hierarchy" +#~ msgstr "Sin jerarqu??a" + #~ msgid "From: %s To: %s" #~ msgstr "Desde: %s A: %s" diff --git a/account_financial_report/i18n/es_MX.po b/account_financial_report/i18n/es_MX.po index 1feb387a..63ef3e15 100644 --- a/account_financial_report/i18n/es_MX.po +++ b/account_financial_report/i18n/es_MX.po @@ -381,11 +381,6 @@ msgstr "" msgid "Centralized" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -418,24 +413,6 @@ msgstr "" msgid "Compute accounts" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -923,11 +900,6 @@ msgstr "" msgid "Hierarchy Levels to display" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1124,11 +1096,6 @@ msgstr "" msgid "No group" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1431,6 +1398,11 @@ msgstr "" msgid "Show foreign currency" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1662,6 +1634,11 @@ msgid "" "balance." msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html diff --git a/account_financial_report/i18n/fr.po b/account_financial_report/i18n/fr.po index 400456e1..9d4c2970 100644 --- a/account_financial_report/i18n/fr.po +++ b/account_financial_report/i18n/fr.po @@ -378,11 +378,6 @@ msgstr "Filtre de centralisation" msgid "Centralized" msgstr "Centralis??" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Comptes enfants" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -415,33 +410,6 @@ msgstr "Soci??t??" msgid "Compute accounts" msgstr "Calculer les comptes" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Comptes calcul??s" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" -"Comptes calcul??s: ?? utiliser lorsque les groupes de comptes ont des codes\n" -" qui repr??sentent des pr??fixes des comptes actuels.\n" -"\n" -" Comptes enfants: ?? utiliser lorsque vos groupes de comptes sont " -"hi??rarchis??s.\n" -"\n" -" Pas de hi??rarchie: ?? utiliser pour n'afficher que les comptes sans " -"aucun groupement.\n" -" " - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -941,11 +909,6 @@ msgstr "Cacher les comptes ?? 0" msgid "Hierarchy Levels to display" msgstr "Niveaux de hi??rarchie ?? afficher" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Hi??rarchiser sur" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1149,11 +1112,6 @@ msgstr "Non" msgid "No group" msgstr "Sans groupe" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "Sans hi??rarchie" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1463,6 +1421,11 @@ msgstr "Afficher les ??tiquettes analytiques" msgid "Show foreign currency" msgstr "Afficher les devises ??trang??res" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1704,6 +1667,11 @@ msgstr "" "cl??ture ?? 0. Si les partenaires sont filtr??s, les totaux des d??bits et " "cr??dits ne correspondront pas ?? la balance g??n??rale." +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1837,6 +1805,39 @@ msgstr "Largeur : 38,92%;" msgid "width: 8.11%;" msgstr "largeur : 8.11% ;" +#~ msgid "Child Accounts" +#~ msgstr "Comptes enfants" + +#~ msgid "Computed Accounts" +#~ msgstr "Comptes calcul??s" + +#~ msgid "" +#~ "Computed Accounts: Use when the account group have codes\n" +#~ " that represent prefixes of the actual accounts.\n" +#~ "\n" +#~ " Child Accounts: Use when your account groups are hierarchical.\n" +#~ "\n" +#~ " No hierarchy: Use to display just the accounts, without any " +#~ "grouping.\n" +#~ " " +#~ msgstr "" +#~ "Comptes calcul??s: ?? utiliser lorsque les groupes de comptes ont des " +#~ "codes\n" +#~ " qui repr??sentent des pr??fixes des comptes actuels.\n" +#~ "\n" +#~ " Comptes enfants: ?? utiliser lorsque vos groupes de comptes sont " +#~ "hi??rarchis??s.\n" +#~ "\n" +#~ " Pas de hi??rarchie: ?? utiliser pour n'afficher que les comptes " +#~ "sans aucun groupement.\n" +#~ " " + +#~ msgid "Hierarchy On" +#~ msgstr "Hi??rarchiser sur" + +#~ msgid "No hierarchy" +#~ msgstr "Sans hi??rarchie" + #~ msgid "From: %s To: %s" #~ msgstr "Du: %s au: %s" diff --git a/account_financial_report/i18n/fr_CH.po b/account_financial_report/i18n/fr_CH.po index a28c2655..80833800 100644 --- a/account_financial_report/i18n/fr_CH.po +++ b/account_financial_report/i18n/fr_CH.po @@ -379,11 +379,6 @@ msgstr "Filtre de centralisation" msgid "Centralized" msgstr "Centralis??" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Comptes enfants" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -416,33 +411,6 @@ msgstr "Soci??t??" msgid "Compute accounts" msgstr "Calculer les comptes" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Comptes calcul??s" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" -"Comptes calcul??s: ?? utiliser lorsque les groupes de comptes ont des codes\n" -" qui repr??sentent des pr??fixes des comptes actuels.\n" -"\n" -" Comptes enfants: ?? utiliser lorsque vos groupes de comptes sont " -"hi??rarchis??s.\n" -"\n" -" Pas de hi??rarchie: ?? utiliser pour n'afficher que les comptes sans " -"aucun groupement.\n" -" " - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -949,11 +917,6 @@ msgstr "Cacher les comptes ?? 0" msgid "Hierarchy Levels to display" msgstr "Niveaux de hi??rarchie ?? afficher" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Hi??rarchiser sur" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1159,11 +1122,6 @@ msgstr "Non" msgid "No group" msgstr "Sans groupe" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "Sans hi??rarchie" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1476,6 +1434,11 @@ msgstr "Afficher les ??tiquettes analytiques" msgid "Show foreign currency" msgstr "Afficher les devises ??trang??res" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1719,6 +1682,11 @@ msgstr "" "cl??ture ?? 0. Si les partenaires sont filtr??s, les totaux des d??bits et " "cr??dits ne correspondront pas ?? la balance g??n??rale." +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1854,6 +1822,39 @@ msgstr "" msgid "width: 8.11%;" msgstr "" +#~ msgid "Child Accounts" +#~ msgstr "Comptes enfants" + +#~ msgid "Computed Accounts" +#~ msgstr "Comptes calcul??s" + +#~ msgid "" +#~ "Computed Accounts: Use when the account group have codes\n" +#~ " that represent prefixes of the actual accounts.\n" +#~ "\n" +#~ " Child Accounts: Use when your account groups are hierarchical.\n" +#~ "\n" +#~ " No hierarchy: Use to display just the accounts, without any " +#~ "grouping.\n" +#~ " " +#~ msgstr "" +#~ "Comptes calcul??s: ?? utiliser lorsque les groupes de comptes ont des " +#~ "codes\n" +#~ " qui repr??sentent des pr??fixes des comptes actuels.\n" +#~ "\n" +#~ " Comptes enfants: ?? utiliser lorsque vos groupes de comptes sont " +#~ "hi??rarchis??s.\n" +#~ "\n" +#~ " Pas de hi??rarchie: ?? utiliser pour n'afficher que les comptes " +#~ "sans aucun groupement.\n" +#~ " " + +#~ msgid "Hierarchy On" +#~ msgstr "Hi??rarchiser sur" + +#~ msgid "No hierarchy" +#~ msgstr "Sans hi??rarchie" + #~ msgid "From: %s To: %s" #~ msgstr "Du: %s au: %s" diff --git a/account_financial_report/i18n/fr_FR.po b/account_financial_report/i18n/fr_FR.po index c82b72dd..f7cbfa0a 100644 --- a/account_financial_report/i18n/fr_FR.po +++ b/account_financial_report/i18n/fr_FR.po @@ -375,11 +375,6 @@ msgstr "Filtre de centralisation" msgid "Centralized" msgstr "Centralis??" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Comptes enfants" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -412,33 +407,6 @@ msgstr "Soci??t??" msgid "Compute accounts" msgstr "Calculer les comptes" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Comptes calcul??s" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" -"Comptes calcul??s: ?? utiliser lorsque les groupes de comptes ont des codes\n" -" qui repr??sentent des pr??fixes des comptes actuels.\n" -"\n" -" Comptes enfants: ?? utiliser lorsque vos groupes de comptes sont " -"hi??rarchis??s.\n" -"\n" -" Pas de hi??rarchie: ?? utiliser pour n'afficher que les comptes sans " -"aucun groupement.\n" -" " - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -937,11 +905,6 @@ msgstr "Cacher les comptes ?? 0" msgid "Hierarchy Levels to display" msgstr "Niveaux de hi??rarchie ?? afficher" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Hi??rarchiser sur" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1144,11 +1107,6 @@ msgstr "Non" msgid "No group" msgstr "Sans groupe" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "Sans hi??rarchie" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1457,6 +1415,11 @@ msgstr "Afficher les ??tiquettes analytiques" msgid "Show foreign currency" msgstr "Afficher les devises ??trang??res" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1698,6 +1661,11 @@ msgstr "" "cl??ture ?? 0. Si les partenaires sont filtr??s, les totaux des d??bits et " "cr??dits ne correspondront pas ?? la balance g??n??rale." +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1831,6 +1799,39 @@ msgstr "Largeur : 38,92%;" msgid "width: 8.11%;" msgstr "largeur : 8.11% ;" +#~ msgid "Child Accounts" +#~ msgstr "Comptes enfants" + +#~ msgid "Computed Accounts" +#~ msgstr "Comptes calcul??s" + +#~ msgid "" +#~ "Computed Accounts: Use when the account group have codes\n" +#~ " that represent prefixes of the actual accounts.\n" +#~ "\n" +#~ " Child Accounts: Use when your account groups are hierarchical.\n" +#~ "\n" +#~ " No hierarchy: Use to display just the accounts, without any " +#~ "grouping.\n" +#~ " " +#~ msgstr "" +#~ "Comptes calcul??s: ?? utiliser lorsque les groupes de comptes ont des " +#~ "codes\n" +#~ " qui repr??sentent des pr??fixes des comptes actuels.\n" +#~ "\n" +#~ " Comptes enfants: ?? utiliser lorsque vos groupes de comptes sont " +#~ "hi??rarchis??s.\n" +#~ "\n" +#~ " Pas de hi??rarchie: ?? utiliser pour n'afficher que les comptes " +#~ "sans aucun groupement.\n" +#~ " " + +#~ msgid "Hierarchy On" +#~ msgstr "Hi??rarchiser sur" + +#~ msgid "No hierarchy" +#~ msgstr "Sans hi??rarchie" + #~ msgid "From: %s To: %s" #~ msgstr "Du: %s au: %s" diff --git a/account_financial_report/i18n/hr.po b/account_financial_report/i18n/hr.po index b7a0e9b7..1e84c8d2 100644 --- a/account_financial_report/i18n/hr.po +++ b/account_financial_report/i18n/hr.po @@ -377,11 +377,6 @@ msgstr "" msgid "Centralized" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -414,24 +409,6 @@ msgstr "Tvrtka" msgid "Compute accounts" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -919,11 +896,6 @@ msgstr "" msgid "Hierarchy Levels to display" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1120,11 +1092,6 @@ msgstr "" msgid "No group" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1427,6 +1394,11 @@ msgstr "" msgid "Show foreign currency" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1658,6 +1630,11 @@ msgid "" "balance." msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html diff --git a/account_financial_report/i18n/hr_HR.po b/account_financial_report/i18n/hr_HR.po index fa64cce4..b2b3041a 100644 --- a/account_financial_report/i18n/hr_HR.po +++ b/account_financial_report/i18n/hr_HR.po @@ -385,11 +385,6 @@ msgstr "" msgid "Centralized" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -422,24 +417,6 @@ msgstr "Tvrtka" msgid "Compute accounts" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -927,11 +904,6 @@ msgstr "" msgid "Hierarchy Levels to display" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1128,11 +1100,6 @@ msgstr "" msgid "No group" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1435,6 +1402,11 @@ msgstr "" msgid "Show foreign currency" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1669,6 +1641,11 @@ msgid "" "balance." msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html diff --git a/account_financial_report/i18n/it.po b/account_financial_report/i18n/it.po index f7b7529f..3f281357 100644 --- a/account_financial_report/i18n/it.po +++ b/account_financial_report/i18n/it.po @@ -389,11 +389,6 @@ msgstr "Filtro centralizzazione" msgid "Centralized" msgstr "Centralizzato" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Conti figli" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -426,32 +421,6 @@ msgstr "Azienda" msgid "Compute accounts" msgstr "Calcolare conti" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Conti calcolati" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" -"Conti calcolati: utilizzato quando i gruppi di conti hanno codici\n" -" che rappresentano il prefisso dei conti effettivi.\n" -"\n" -" Conti figli: utilizzato quando i gruppi di conti sono gerarchici.\n" -"\n" -" Nessuna gerarchia: utilizzato per visualizzare solo i conti, senza " -"alcun raggruppo.\n" -" " - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -955,11 +924,6 @@ msgstr "Nascondere conti a 0" msgid "Hierarchy Levels to display" msgstr "Livelli da mostrare" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Gerarchia su" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1161,11 +1125,6 @@ msgstr "" msgid "No group" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "Nessuna gerarchia" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1479,6 +1438,11 @@ msgstr "Mostrare tag analitici" msgid "Show foreign currency" msgstr "Mostrare valuta estera" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1712,6 +1676,11 @@ msgid "" "balance." msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1845,6 +1814,38 @@ msgstr "" msgid "width: 8.11%;" msgstr "" +#~ msgid "Child Accounts" +#~ msgstr "Conti figli" + +#~ msgid "Computed Accounts" +#~ msgstr "Conti calcolati" + +#~ msgid "" +#~ "Computed Accounts: Use when the account group have codes\n" +#~ " that represent prefixes of the actual accounts.\n" +#~ "\n" +#~ " Child Accounts: Use when your account groups are hierarchical.\n" +#~ "\n" +#~ " No hierarchy: Use to display just the accounts, without any " +#~ "grouping.\n" +#~ " " +#~ msgstr "" +#~ "Conti calcolati: utilizzato quando i gruppi di conti hanno codici\n" +#~ " che rappresentano il prefisso dei conti effettivi.\n" +#~ "\n" +#~ " Conti figli: utilizzato quando i gruppi di conti sono " +#~ "gerarchici.\n" +#~ "\n" +#~ " Nessuna gerarchia: utilizzato per visualizzare solo i conti, " +#~ "senza alcun raggruppo.\n" +#~ " " + +#~ msgid "Hierarchy On" +#~ msgstr "Gerarchia su" + +#~ msgid "No hierarchy" +#~ msgstr "Nessuna gerarchia" + #~ msgid "From: %s To: %s" #~ msgstr "Da: %s A: %s" diff --git a/account_financial_report/i18n/ja.po b/account_financial_report/i18n/ja.po index 0b888262..85969a16 100644 --- a/account_financial_report/i18n/ja.po +++ b/account_financial_report/i18n/ja.po @@ -378,11 +378,6 @@ msgstr "" msgid "Centralized" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -415,24 +410,6 @@ msgstr "" msgid "Compute accounts" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -920,11 +897,6 @@ msgstr "" msgid "Hierarchy Levels to display" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1121,11 +1093,6 @@ msgstr "" msgid "No group" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1428,6 +1395,11 @@ msgstr "" msgid "Show foreign currency" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1659,6 +1631,11 @@ msgid "" "balance." msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html diff --git a/account_financial_report/i18n/nl.po b/account_financial_report/i18n/nl.po index b2fb356e..e928e49c 100644 --- a/account_financial_report/i18n/nl.po +++ b/account_financial_report/i18n/nl.po @@ -392,11 +392,6 @@ msgstr "Centralisatie filter" msgid "Centralized" msgstr "Gecentraliseerd" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Onderliggende rekeningen" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -430,24 +425,6 @@ msgstr "Bedrijf" msgid "Compute accounts" msgstr "Berekende rekeningen" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Berekende rekeningen" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -956,11 +933,6 @@ msgstr "Verberg rekeningen met balans 0" msgid "Hierarchy Levels to display" msgstr "Hierarchie niveaus om weer te geven" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Hi??rarchie aan" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1168,11 +1140,6 @@ msgstr "Nee" msgid "No group" msgstr "Geen groep" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "Geen Hi??rarchie" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1486,6 +1453,11 @@ msgstr "" msgid "Show foreign currency" msgstr "Toon buitenlandse valuta" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1724,6 +1696,11 @@ msgstr "" "verbergen. Als partners zijn gefilterd, komen de debet- en credit totalen " "niet overeen met de proefbalans." +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1862,6 +1839,18 @@ msgstr "breedte: 38.92%;" msgid "width: 8.11%;" msgstr "breedte: 8.11%;" +#~ msgid "Child Accounts" +#~ msgstr "Onderliggende rekeningen" + +#~ msgid "Computed Accounts" +#~ msgstr "Berekende rekeningen" + +#~ msgid "Hierarchy On" +#~ msgstr "Hi??rarchie aan" + +#~ msgid "No hierarchy" +#~ msgstr "Geen Hi??rarchie" + #~ msgid "From: %s To: %s" #~ msgstr "Van: %s Tot: %s" diff --git a/account_financial_report/i18n/nl_NL.po b/account_financial_report/i18n/nl_NL.po index 6a14f6b9..fcce3e2f 100644 --- a/account_financial_report/i18n/nl_NL.po +++ b/account_financial_report/i18n/nl_NL.po @@ -384,11 +384,6 @@ msgstr "" msgid "Centralized" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -421,24 +416,6 @@ msgstr "Bedrijf" msgid "Compute accounts" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -926,11 +903,6 @@ msgstr "" msgid "Hierarchy Levels to display" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1127,11 +1099,6 @@ msgstr "" msgid "No group" msgstr "" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1434,6 +1401,11 @@ msgstr "" msgid "Show foreign currency" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1668,6 +1640,11 @@ msgid "" "balance." msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html diff --git a/account_financial_report/i18n/pt.po b/account_financial_report/i18n/pt.po index b52bc4a5..5b060f1c 100644 --- a/account_financial_report/i18n/pt.po +++ b/account_financial_report/i18n/pt.po @@ -378,11 +378,6 @@ msgstr "Filtro de Centraliza????o" msgid "Centralized" msgstr "Centralizado" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Contas Descendentes" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -415,33 +410,6 @@ msgstr "Empresa" msgid "Compute accounts" msgstr "Calcular contas" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Calcular Contas" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" -"Contas Calculadas: Usar quando o grupo de contas tem c??digos\n" -" que representam prefixos das contas reais.\n" -"\n" -" Contas Descendentes: Usar quando o grupo de contas tem estrutura " -"hier??rquica.\n" -"\n" -" Sem hierarquia: Usar para exibir apenas as contas, sem qualquer " -"agrupmento.\n" -" " - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -934,11 +902,6 @@ msgstr "Esconder contas a 0" msgid "Hierarchy Levels to display" msgstr "N??veis Hier??rquicos a exibir" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Hierarquia em" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1139,11 +1102,6 @@ msgstr "N??o" msgid "No group" msgstr "Sem grupo" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "Sem hierarquia" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1450,6 +1408,11 @@ msgstr "Exibir etiquetas anal??ticas" msgid "Show foreign currency" msgstr "Exibir divisa estrangeira" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1692,6 +1655,11 @@ msgstr "" "Se filtrarem parceiros, os totais do d??bito e cr??dito n??o ser??o iguais aos " "do balancete." +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1825,6 +1793,38 @@ msgstr "largura: 38.92%;" msgid "width: 8.11%;" msgstr "largura: 8.11%;" +#~ msgid "Child Accounts" +#~ msgstr "Contas Descendentes" + +#~ msgid "Computed Accounts" +#~ msgstr "Calcular Contas" + +#~ msgid "" +#~ "Computed Accounts: Use when the account group have codes\n" +#~ " that represent prefixes of the actual accounts.\n" +#~ "\n" +#~ " Child Accounts: Use when your account groups are hierarchical.\n" +#~ "\n" +#~ " No hierarchy: Use to display just the accounts, without any " +#~ "grouping.\n" +#~ " " +#~ msgstr "" +#~ "Contas Calculadas: Usar quando o grupo de contas tem c??digos\n" +#~ " que representam prefixos das contas reais.\n" +#~ "\n" +#~ " Contas Descendentes: Usar quando o grupo de contas tem estrutura " +#~ "hier??rquica.\n" +#~ "\n" +#~ " Sem hierarquia: Usar para exibir apenas as contas, sem qualquer " +#~ "agrupmento.\n" +#~ " " + +#~ msgid "Hierarchy On" +#~ msgstr "Hierarquia em" + +#~ msgid "No hierarchy" +#~ msgstr "Sem hierarquia" + #~ msgid "From: %s To: %s" #~ msgstr "De: %s A: %s" diff --git a/account_financial_report/i18n/pt_BR.po b/account_financial_report/i18n/pt_BR.po index 7aa048bd..0790c6ae 100644 --- a/account_financial_report/i18n/pt_BR.po +++ b/account_financial_report/i18n/pt_BR.po @@ -387,11 +387,6 @@ msgstr "Filtro Centralizar" msgid "Centralized" msgstr "Centralizado" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Contas Filhas" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -424,32 +419,6 @@ msgstr "Empresa" msgid "Compute accounts" msgstr "Contas calculadas" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Contas Calculadas" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" -"Contas Calculadas: Utilize quando o grupo de contas possui c??digos \n" -" que representam prefixos das contas do realizado.\n" -"\n" -" Contas Filhas: Utilize quando o grupo de contas ?? hier??rquico.\n" -"\n" -" Sem hierarquia: Utilize para exibir apenas as contas, sem qualquer " -"agrupamento.\n" -" " - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -956,11 +925,6 @@ msgstr "Ocultar contas zeradas" msgid "Hierarchy Levels to display" msgstr "N??veis Hier??rquicos para exibir" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Hierarquia Habilitada" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1166,11 +1130,6 @@ msgstr "N??o" msgid "No group" msgstr "Sem grupo" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "Sem hierarquia" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1483,6 +1442,11 @@ msgstr "Exibir marcadores anal??ticos" msgid "Show foreign currency" msgstr "Exibir moeda estrangeira" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1726,6 +1690,11 @@ msgstr "" "zerado. Se houver parceiros filtrados, os totais de d??bitos e cr??ditos n??o " "coincidir??o com o balancete." +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1861,6 +1830,37 @@ msgstr "largura: 38.92%;" msgid "width: 8.11%;" msgstr "largura: 8.11%;" +#~ msgid "Child Accounts" +#~ msgstr "Contas Filhas" + +#~ msgid "Computed Accounts" +#~ msgstr "Contas Calculadas" + +#~ msgid "" +#~ "Computed Accounts: Use when the account group have codes\n" +#~ " that represent prefixes of the actual accounts.\n" +#~ "\n" +#~ " Child Accounts: Use when your account groups are hierarchical.\n" +#~ "\n" +#~ " No hierarchy: Use to display just the accounts, without any " +#~ "grouping.\n" +#~ " " +#~ msgstr "" +#~ "Contas Calculadas: Utilize quando o grupo de contas possui c??digos \n" +#~ " que representam prefixos das contas do realizado.\n" +#~ "\n" +#~ " Contas Filhas: Utilize quando o grupo de contas ?? hier??rquico.\n" +#~ "\n" +#~ " Sem hierarquia: Utilize para exibir apenas as contas, sem " +#~ "qualquer agrupamento.\n" +#~ " " + +#~ msgid "Hierarchy On" +#~ msgstr "Hierarquia Habilitada" + +#~ msgid "No hierarchy" +#~ msgstr "Sem hierarquia" + #~ msgid "From: %s To: %s" #~ msgstr "De: %s At??: %s" diff --git a/account_financial_report/i18n/ro.po b/account_financial_report/i18n/ro.po index dbccc225..0e691d5c 100644 --- a/account_financial_report/i18n/ro.po +++ b/account_financial_report/i18n/ro.po @@ -388,11 +388,6 @@ msgstr "Centraliza??i filtrul" msgid "Centralized" msgstr "Centralizat" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation -msgid "Child Accounts" -msgstr "Conturi subordonate" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__group_child_ids msgid "Child Groups" @@ -425,24 +420,6 @@ msgstr "Companie" msgid "Compute accounts" msgstr "Conturi calculate" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed -msgid "Computed Accounts" -msgstr "Conturi calculate" - -#. module: account_financial_report -#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "" -"Computed Accounts: Use when the account group have codes\n" -" that represent prefixes of the actual accounts.\n" -"\n" -" Child Accounts: Use when your account groups are hierarchical.\n" -"\n" -" No hierarchy: Use to display just the accounts, without any " -"grouping.\n" -" " -msgstr "" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid @@ -938,11 +915,6 @@ msgstr "Ascunde conturile cu zero" msgid "Hierarchy Levels to display" msgstr "Niveluri Ierahie de afi??at" -#. module: account_financial_report -#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hierarchy_on -msgid "Hierarchy On" -msgstr "Activare ierarhie" - #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id @@ -1145,11 +1117,6 @@ msgstr "Nu" msgid "No group" msgstr "Niciun grup" -#. module: account_financial_report -#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none -msgid "No hierarchy" -msgstr "F??r?? ierahie" - #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters @@ -1452,6 +1419,11 @@ msgstr "Afi??a??i etichete analitice" msgid "Show foreign currency" msgstr "Afi??a??i moned?? str??in??" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Show hierarchy" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__sort_option msgid "Sort entries by" @@ -1689,6 +1661,11 @@ msgstr "" "final la 0. Dac?? partenerii sunt filtra??i, totalele de debitelor ??i " "creditelor nu vor corespunde soldului de prob??." +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__show_hierarchy +msgid "Use when your account groups are hierarchical" +msgstr "" + #. module: account_financial_report #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html @@ -1825,6 +1802,18 @@ msgstr "l????ime: 38,92%;" msgid "width: 8.11%;" msgstr "l????ime: 8,11%;" +#~ msgid "Child Accounts" +#~ msgstr "Conturi subordonate" + +#~ msgid "Computed Accounts" +#~ msgstr "Conturi calculate" + +#~ msgid "Hierarchy On" +#~ msgstr "Activare ierarhie" + +#~ msgid "No hierarchy" +#~ msgstr "F??r?? ierahie" + #~ msgid "From: %s To: %s" #~ msgstr "De la: %s la: %s" diff --git a/account_financial_report/report/templates/trial_balance.xml b/account_financial_report/report/templates/trial_balance.xml index acc45e09..411ccc17 100644 --- a/account_financial_report/report/templates/trial_balance.xml +++ b/account_financial_report/report/templates/trial_balance.xml @@ -46,56 +46,22 @@ - - - - - + + - - - - - - - - - - - - - - - - - - - - - - + t-if="show_hierarchy_level > balance['level'] and (not hide_parent_hierarchy_level or (show_hierarchy_level - 1) == balance['level'])" + > + + + diff --git a/account_financial_report/report/trial_balance.py b/account_financial_report/report/trial_balance.py index 849ce648..9747fba6 100644 --- a/account_financial_report/report/trial_balance.py +++ b/account_financial_report/report/trial_balance.py @@ -662,7 +662,7 @@ class TrialBalanceReport(models.AbstractModel): date_to = data["date_to"] date_from = data["date_from"] hide_account_at_0 = data["hide_account_at_0"] - hierarchy_on = data["hierarchy_on"] + show_hierarchy = data["show_hierarchy"] show_hierarchy_level = data["show_hierarchy_level"] foreign_currency = data["foreign_currency"] only_posted_moves = data["only_posted_moves"] @@ -706,7 +706,7 @@ class TrialBalanceReport(models.AbstractModel): ], } ) - if hierarchy_on == "relation": + if show_hierarchy: groups_data = self._get_groups_data( accounts_data, total_amount, foreign_currency ) @@ -716,14 +716,7 @@ class TrialBalanceReport(models.AbstractModel): for trial in trial_balance: counter = trial["complete_code"].count("/") trial["level"] = counter - if hierarchy_on == "computed": - groups_data = self._get_computed_groups_data( - accounts_data, total_amount, foreign_currency - ) - trial_balance = list(groups_data.values()) - trial_balance += list(accounts_data.values()) - trial_balance = sorted(trial_balance, key=lambda k: k["code"]) - if hierarchy_on == "none": + else: trial_balance = list(accounts_data.values()) trial_balance = sorted(trial_balance, key=lambda k: k["code"]) else: @@ -749,7 +742,8 @@ class TrialBalanceReport(models.AbstractModel): "hide_account_at_0": data["hide_account_at_0"], "show_partner_details": data["show_partner_details"], "limit_hierarchy_level": data["limit_hierarchy_level"], - "hierarchy_on": hierarchy_on, + "show_hierarchy": show_hierarchy, + "hide_parent_hierarchy_level": data["hide_parent_hierarchy_level"], "trial_balance": trial_balance, "total_amount": total_amount, "accounts_data": accounts_data, diff --git a/account_financial_report/report/trial_balance_xlsx.py b/account_financial_report/report/trial_balance_xlsx.py index 5d844fcb..d5dd9b15 100644 --- a/account_financial_report/report/trial_balance_xlsx.py +++ b/account_financial_report/report/trial_balance_xlsx.py @@ -183,7 +183,7 @@ class TrialBalanceXslx(models.AbstractModel): total_amount = res_data["total_amount"] partners_data = res_data["partners_data"] accounts_data = res_data["accounts_data"] - hierarchy_on = res_data["hierarchy_on"] + show_hierarchy = res_data["show_hierarchy"] show_partner_details = res_data["show_partner_details"] show_hierarchy_level = res_data["show_hierarchy_level"] foreign_currency = res_data["foreign_currency"] @@ -195,21 +195,13 @@ class TrialBalanceXslx(models.AbstractModel): # For each account if not show_partner_details: for balance in trial_balance: - if hierarchy_on == "relation": + if show_hierarchy: if limit_hierarchy_level: if show_hierarchy_level > balance["level"]: # Display account lines self.write_line_from_dict(balance, report_data) else: self.write_line_from_dict(balance, report_data) - elif hierarchy_on == "computed": - if balance["type"] == "account_type": - if limit_hierarchy_level: - if show_hierarchy_level > balance["level"]: - # Display account lines - self.write_line_from_dict(balance, report_data) - else: - self.write_line_from_dict(balance, report_data) else: self.write_line_from_dict(balance, report_data) else: diff --git a/account_financial_report/tests/test_trial_balance.py b/account_financial_report/tests/test_trial_balance.py index f3fd85da..9d91fff9 100644 --- a/account_financial_report/tests/test_trial_balance.py +++ b/account_financial_report/tests/test_trial_balance.py @@ -163,7 +163,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon): move.action_post() def _get_report_lines( - self, with_partners=False, account_ids=False, hierarchy_on="computed" + self, with_partners=False, account_ids=False, show_hierarchy=False ): company = self.env.user.company_id trial_balance = self.env["trial.balance.report.wizard"].create( @@ -172,7 +172,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon): "date_to": self.date_end, "target_move": "posted", "hide_account_at_0": True, - "hierarchy_on": hierarchy_on, + "show_hierarchy": show_hierarchy, "company_id": company.id, "account_ids": account_ids, "fy_start_date": self.fy_date_start, @@ -248,195 +248,9 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon): self.assertTrue(self.account100 in self.group1.compute_account_ids) self.assertTrue(self.account200 in self.group2.compute_account_ids) - def test_01_account_balance_computed(self): - # Change code of the P&L for not being automatically included - # in group 1 balances - earning_accs = self.env["account.account"].search( - [ - ( - "user_type_id", - "=", - self.env.ref("account.data_unaffected_earnings").id, - ), - ("company_id", "=", self.env.user.company_id.id), - ] - ) - for acc in earning_accs: - acc.code = "999" + acc.code - # Generate the general ledger line - res_data = self._get_report_lines() - trial_balance = res_data["trial_balance"] - - check_receivable_account = self.check_account_in_report( - self.account100.id, trial_balance - ) - self.assertFalse(check_receivable_account) - check_income_account = self.check_account_in_report( - self.account200.id, trial_balance - ) - self.assertFalse(check_income_account) - self.assertTrue( - self.check_account_in_report(self.unaffected_account.id, trial_balance) - ) - - # Add a move at the previous day of the first day of fiscal year - # to check the initial balance - self._add_move( - date=self.previous_fy_date_end, - receivable_debit=1000, - receivable_credit=0, - income_debit=0, - income_credit=1000, - ) - - # Re Generate the trial balance line - res_data = self._get_report_lines() - trial_balance = res_data["trial_balance"] - check_receivable_account = self.check_account_in_report( - self.account100.id, trial_balance - ) - self.assertTrue(check_receivable_account) - check_income_account = self.check_account_in_report( - self.account200.id, trial_balance - ) - self.assertFalse(check_income_account) - - # Check the initial and final balance - account_receivable_lines = self._get_account_lines( - self.account100.id, trial_balance - ) - group1_lines = self._get_group_lines(self.group1.id, trial_balance) - - self.assertEqual(account_receivable_lines["initial_balance"], 1000) - self.assertEqual(account_receivable_lines["debit"], 0) - self.assertEqual(account_receivable_lines["credit"], 0) - self.assertEqual(account_receivable_lines["final_balance"], 1000) - - self.assertEqual(group1_lines["initial_balance"], 1000) - self.assertEqual(group1_lines["debit"], 0) - self.assertEqual(group1_lines["credit"], 0) - self.assertEqual(group1_lines["final_balance"], 1000) - - # Add reversed move of the initial move the first day of fiscal year - # to check the first day of fiscal year is not used - # to compute the initial balance - self._add_move( - date=self.fy_date_start, - receivable_debit=0, - receivable_credit=1000, - income_debit=1000, - income_credit=0, - ) - - # Re Generate the trial balance line - res_data = self._get_report_lines() - trial_balance = res_data["trial_balance"] - check_receivable_account = self.check_account_in_report( - self.account100.id, trial_balance - ) - self.assertTrue(check_receivable_account) - check_income_account = self.check_account_in_report( - self.account200.id, trial_balance - ) - self.assertTrue(check_income_account) - - # Re Generate the trial balance line with an account filter - res_data = self._get_report_lines( - account_ids=(self.account100 + self.account200).ids - ) - trial_balance = res_data["trial_balance"] - self.assertTrue(self.check_account_in_report(self.account100.id, trial_balance)) - self.assertTrue(self.check_account_in_report(self.account200.id, trial_balance)) - # Unaffected account should not be present - self.assertFalse( - self.check_account_in_report(self.unaffected_account.id, trial_balance) - ) - - # Check the initial and final balance - account_receivable_lines = self._get_account_lines( - self.account100.id, trial_balance - ) - account_income_lines = self._get_account_lines( - self.account200.id, trial_balance - ) - group1_lines = self._get_group_lines(self.group1.id, trial_balance) - group2_lines = self._get_group_lines(self.group2.id, trial_balance) - - self.assertEqual(account_receivable_lines["initial_balance"], 1000) - self.assertEqual(account_receivable_lines["debit"], 0) - self.assertEqual(account_receivable_lines["credit"], 1000) - self.assertEqual(account_receivable_lines["final_balance"], 0) - - self.assertEqual(account_income_lines["initial_balance"], 0) - self.assertEqual(account_income_lines["debit"], 1000) - self.assertEqual(account_income_lines["credit"], 0) - self.assertEqual(account_income_lines["final_balance"], 1000) - - self.assertEqual(group1_lines["initial_balance"], 1000) - self.assertEqual(group1_lines["debit"], 0) - self.assertEqual(group1_lines["credit"], 1000) - self.assertEqual(group1_lines["final_balance"], 0) - - self.assertEqual(group2_lines["initial_balance"], 0) - self.assertEqual(group2_lines["debit"], 1000) - self.assertEqual(group2_lines["credit"], 0) - self.assertEqual(group2_lines["final_balance"], 1000) - - # Add another move at the end day of fiscal year - # to check that it correctly used on report - self._add_move( - date=self.fy_date_end, - receivable_debit=0, - receivable_credit=1000, - income_debit=1000, - income_credit=0, - ) - - # Re Generate the trial balance line - res_data = self._get_report_lines() - trial_balance = res_data["trial_balance"] - check_receivable_account = self.check_account_in_report( - self.account100.id, trial_balance - ) - self.assertTrue(check_receivable_account) - check_income_account = self.check_account_in_report( - self.account200.id, trial_balance - ) - self.assertTrue(check_income_account) - - # Check the initial and final balance - account_receivable_lines = self._get_account_lines( - self.account100.id, trial_balance - ) - account_income_lines = self._get_account_lines( - self.account200.id, trial_balance - ) - group1_lines = self._get_group_lines(self.group1.id, trial_balance) - group2_lines = self._get_group_lines(self.group2.id, trial_balance) - - self.assertEqual(account_receivable_lines["initial_balance"], 1000) - self.assertEqual(account_receivable_lines["debit"], 0) - self.assertEqual(account_receivable_lines["credit"], 2000) - self.assertEqual(account_receivable_lines["final_balance"], -1000) - - self.assertEqual(account_income_lines["initial_balance"], 0) - self.assertEqual(account_income_lines["debit"], 2000) - self.assertEqual(account_income_lines["credit"], 0) - self.assertEqual(account_income_lines["final_balance"], 2000) - - self.assertEqual(group1_lines["initial_balance"], 1000) - self.assertEqual(group1_lines["debit"], 0) - self.assertEqual(group1_lines["credit"], 2000) - self.assertEqual(group1_lines["final_balance"], -1000) - - self.assertEqual(group2_lines["initial_balance"], 0) - self.assertEqual(group2_lines["debit"], 2000) - self.assertEqual(group2_lines["credit"], 0) - self.assertEqual(group2_lines["final_balance"], 2000) - def test_02_account_balance_hierarchy(self): # Generate the general ledger line - res_data = self._get_report_lines(hierarchy_on="relation") + res_data = self._get_report_lines(show_hierarchy=True) trial_balance = res_data["trial_balance"] check_receivable_account = self.check_account_in_report( self.account100.id, trial_balance @@ -458,7 +272,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon): ) # Re Generate the trial balance line - res_data = self._get_report_lines(hierarchy_on="relation") + res_data = self._get_report_lines(show_hierarchy=True) trial_balance = res_data["trial_balance"] check_receivable_account = self.check_account_in_report( self.account100.id, trial_balance @@ -497,7 +311,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon): ) # Re Generate the trial balance line - res_data = self._get_report_lines(hierarchy_on="relation") + res_data = self._get_report_lines(show_hierarchy=True) trial_balance = res_data["trial_balance"] check_receivable_account = self.check_account_in_report( self.account100.id, trial_balance @@ -549,7 +363,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon): ) # Re Generate the trial balance line - res_data = self._get_report_lines(hierarchy_on="relation") + res_data = self._get_report_lines(show_hierarchy=True) trial_balance = res_data["trial_balance"] check_receivable_account = self.check_account_in_report( self.account100.id, trial_balance @@ -715,7 +529,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon): "date_to": self.date_end, "target_move": "posted", "hide_account_at_0": False, - "hierarchy_on": "none", + "show_hierarchy": False, "company_id": company.id, "fy_start_date": self.fy_date_start, } @@ -768,7 +582,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon): "date_to": self.date_end, "target_move": "posted", "hide_account_at_0": False, - "hierarchy_on": "none", + "show_hierarchy": False, "company_id": company.id, "fy_start_date": self.fy_date_start, } @@ -822,7 +636,7 @@ class TestTrialBalanceReport(AccountTestInvoicingCommon): "date_to": self.date_end, "target_move": "posted", "hide_account_at_0": False, - "hierarchy_on": "none", + "show_hierarchy": False, "company_id": company.id, "fy_start_date": self.fy_date_start, } diff --git a/account_financial_report/wizard/trial_balance_wizard.py b/account_financial_report/wizard/trial_balance_wizard.py index daa7a874..1da9aefd 100644 --- a/account_financial_report/wizard/trial_balance_wizard.py +++ b/account_financial_report/wizard/trial_balance_wizard.py @@ -26,19 +26,9 @@ class TrialBalanceReportWizard(models.TransientModel): required=True, default="posted", ) - hierarchy_on = fields.Selection( - [ - ("computed", "Computed Accounts"), - ("relation", "Child Accounts"), - ("none", "No hierarchy"), - ], - required=True, - default="none", - help="""Computed Accounts: Use when the account group have codes - that represent prefixes of the actual accounts.\n - Child Accounts: Use when your account groups are hierarchical.\n - No hierarchy: Use to display just the accounts, without any grouping. - """, + show_hierarchy = fields.Boolean( + string="Show hierarchy", + help="Use when your account groups are hierarchical", ) limit_hierarchy_level = fields.Boolean("Limit hierarchy levels") show_hierarchy_level = fields.Integer("Hierarchy Levels to display", default=1) @@ -96,12 +86,12 @@ class TrialBalanceReportWizard(models.TransientModel): lambda a: a.company_id == self.company_id ) - @api.constrains("hierarchy_on", "show_hierarchy_level") + @api.constrains("show_hierarchy", "show_hierarchy_level") def _check_show_hierarchy_level(self): for rec in self: - if rec.hierarchy_on != "none" and rec.show_hierarchy_level <= 0: + if rec.show_hierarchy and rec.show_hierarchy_level <= 0: raise UserError( - _("The hierarchy level to filter on must be " "greater than 0.") + _("The hierarchy level to filter on must be greater than 0.") ) @api.depends("date_from") @@ -261,7 +251,7 @@ class TrialBalanceReportWizard(models.TransientModel): "partner_ids": self.partner_ids.ids or [], "journal_ids": self.journal_ids.ids or [], "fy_start_date": self.fy_start_date, - "hierarchy_on": self.hierarchy_on, + "show_hierarchy": self.show_hierarchy, "limit_hierarchy_level": self.limit_hierarchy_level, "show_hierarchy_level": self.show_hierarchy_level, "hide_parent_hierarchy_level": self.hide_parent_hierarchy_level, diff --git a/account_financial_report/wizard/trial_balance_wizard_view.xml b/account_financial_report/wizard/trial_balance_wizard_view.xml index 486b9ec3..11fc754b 100644 --- a/account_financial_report/wizard/trial_balance_wizard_view.xml +++ b/account_financial_report/wizard/trial_balance_wizard_view.xml @@ -28,13 +28,12 @@