From 108e4f2cd3dcb2405bff69f6f6764c1aa7cf5cac Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Wed, 25 Sep 2019 11:42:02 +0200 Subject: [PATCH] [12.0][FIX] - Hide ending balance if general ledger is filtered by partner --- account_financial_report/__manifest__.py | 2 +- .../i18n/account_financial_report.pot | 8 +- account_financial_report/i18n/ar.po | 8 +- account_financial_report/i18n/ca.po | 8 +- account_financial_report/i18n/de.po | 8 +- account_financial_report/i18n/es.po | 8 +- account_financial_report/i18n/fr.po | 8 +- account_financial_report/i18n/hr_HR.po | 8 +- account_financial_report/i18n/it.po | 8 +- account_financial_report/i18n/ja.po | 83 +++++++++++++------ account_financial_report/i18n/nl.po | 8 +- account_financial_report/i18n/nl_NL.po | 8 +- account_financial_report/i18n/pt.po | 8 +- account_financial_report/i18n/pt_BR.po | 83 +++++++++++++------ account_financial_report/i18n/ro.po | 8 +- .../report/general_ledger_xlsx.py | 3 +- .../report/templates/general_ledger.xml | 2 +- 17 files changed, 166 insertions(+), 103 deletions(-) diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py index be663eb0..4bf40b51 100644 --- a/account_financial_report/__manifest__.py +++ b/account_financial_report/__manifest__.py @@ -4,7 +4,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Account Financial Reports', - 'version': '12.0.1.1.0', + 'version': '12.0.1.2.1', '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 2154cd56..051dd4e8 100644 --- a/account_financial_report/i18n/account_financial_report.pot +++ b/account_financial_report/i18n/account_financial_report.pot @@ -930,7 +930,7 @@ msgid "Ending\n" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1319,7 +1319,7 @@ msgid "Initial Debit" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1779,7 +1779,7 @@ msgid "Partner ID" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "" @@ -1791,7 +1791,7 @@ msgid "Partner cumul aged balance" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/i18n/ar.po b/account_financial_report/i18n/ar.po index 63384d9e..534ed677 100644 --- a/account_financial_report/i18n/ar.po +++ b/account_financial_report/i18n/ar.po @@ -956,7 +956,7 @@ msgid "" msgstr "الرصيد الختامي" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1358,7 +1358,7 @@ msgid "Initial Debit" msgstr "المدين الافتتاحي" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1826,7 +1826,7 @@ msgid "Partner ID" msgstr "الشريك" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "رصيد الشريك الافتتاحي" @@ -1838,7 +1838,7 @@ msgid "Partner cumul aged balance" msgstr "إجمالي الرصيد التراكمي" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/i18n/ca.po b/account_financial_report/i18n/ca.po index 3bf298b1..7b77e461 100644 --- a/account_financial_report/i18n/ca.po +++ b/account_financial_report/i18n/ca.po @@ -950,7 +950,7 @@ msgid "" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1344,7 +1344,7 @@ msgid "Initial Debit" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1805,7 +1805,7 @@ msgid "Partner ID" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "" @@ -1817,7 +1817,7 @@ msgid "Partner cumul aged balance" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/i18n/de.po b/account_financial_report/i18n/de.po index 00eb6702..bbd5dd6c 100644 --- a/account_financial_report/i18n/de.po +++ b/account_financial_report/i18n/de.po @@ -980,7 +980,7 @@ msgid "" msgstr "Endstand" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1382,7 +1382,7 @@ msgid "Initial Debit" msgstr "Anfangssoll" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1849,7 +1849,7 @@ msgid "Partner ID" msgstr "Partner" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "Partner-Anfangssaldo" @@ -1861,7 +1861,7 @@ msgid "Partner cumul aged balance" msgstr "Partner-Salden nach Alter" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/i18n/es.po b/account_financial_report/i18n/es.po index 894ef78f..55784404 100644 --- a/account_financial_report/i18n/es.po +++ b/account_financial_report/i18n/es.po @@ -965,7 +965,7 @@ msgstr "" " final" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1365,7 +1365,7 @@ msgid "Initial Debit" msgstr "Saldo inicial Debe" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1826,7 +1826,7 @@ msgid "Partner ID" msgstr "Cliente" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "Saldo Inicial de empresa" @@ -1838,7 +1838,7 @@ msgid "Partner cumul aged balance" msgstr "Saldo Acumulado de Empresa" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/i18n/fr.po b/account_financial_report/i18n/fr.po index 907476d2..8b47708f 100644 --- a/account_financial_report/i18n/fr.po +++ b/account_financial_report/i18n/fr.po @@ -949,7 +949,7 @@ msgid "" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1345,7 +1345,7 @@ msgid "Initial Debit" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1806,7 +1806,7 @@ msgid "Partner ID" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "" @@ -1818,7 +1818,7 @@ msgid "Partner cumul aged balance" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/i18n/hr_HR.po b/account_financial_report/i18n/hr_HR.po index 5bea22e0..f33fb125 100644 --- a/account_financial_report/i18n/hr_HR.po +++ b/account_financial_report/i18n/hr_HR.po @@ -956,7 +956,7 @@ msgid "" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1350,7 +1350,7 @@ msgid "Initial Debit" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1811,7 +1811,7 @@ msgid "Partner ID" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "" @@ -1823,7 +1823,7 @@ msgid "Partner cumul aged balance" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/i18n/it.po b/account_financial_report/i18n/it.po index a81c1e70..01a21ac3 100644 --- a/account_financial_report/i18n/it.po +++ b/account_financial_report/i18n/it.po @@ -974,7 +974,7 @@ msgstr "" " finale" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1368,7 +1368,7 @@ msgid "Initial Debit" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1835,7 +1835,7 @@ msgid "Partner ID" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "Partner - Saldo iniziale" @@ -1847,7 +1847,7 @@ msgid "Partner cumul aged balance" msgstr "Partner - Saldo progressivo" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/i18n/ja.po b/account_financial_report/i18n/ja.po index d53030e3..391438ba 100644 --- a/account_financial_report/i18n/ja.po +++ b/account_financial_report/i18n/ja.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_financial_report +# * account_financial_report # msgid "" msgstr "" @@ -180,7 +180,8 @@ msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines -msgid "Age ≤ 120\n" +msgid "" +"Age ≤ 120\n" " d." msgstr "" @@ -193,7 +194,8 @@ msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines -msgid "Age ≤ 30\n" +msgid "" +"Age ≤ 30\n" " d." msgstr "" @@ -206,7 +208,8 @@ msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines -msgid "Age ≤ 60\n" +msgid "" +"Age ≤ 60\n" " d." msgstr "" @@ -219,7 +222,8 @@ msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines -msgid "Age ≤ 90\n" +msgid "" +"Age ≤ 90\n" " d." msgstr "" @@ -501,18 +505,21 @@ msgstr "" #. module: account_financial_report #: model:ir.model.fields,help:account_financial_report.field_report_trial_balance__hierarchy_on #: 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" +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" +" No hierarchy: Use to display just the accounts, without any " +"grouping.\n" " " msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines -msgid "Cost\n" +msgid "" +"Cost\n" " center" msgstr "" @@ -894,7 +901,10 @@ msgstr "" #: model:ir.model.fields,help:account_financial_report.field_general_ledger_report_wizard__foreign_currency #: model:ir.model.fields,help:account_financial_report.field_open_items_report_wizard__foreign_currency #: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__foreign_currency -msgid "Display foreign currency for move lines, unless account currency is not setup through chart of accounts will display initial and final balance in that currency." +msgid "" +"Display foreign currency for move lines, unless account currency is not " +"setup through chart of accounts will display initial and final balance in " +"that currency." msgstr "" #. module: account_financial_report @@ -906,7 +916,8 @@ msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines -msgid "Due\n" +msgid "" +"Due\n" " date" msgstr "" @@ -929,12 +940,13 @@ msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul -msgid "Ending\n" +msgid "" +"Ending\n" " balance" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1180,7 +1192,9 @@ msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard -msgid "General Ledger can be computed only if selected company have only one unaffected earnings account." +msgid "" +"General Ledger can be computed only if selected company have only one " +"unaffected earnings account." msgstr "" #. module: account_financial_report @@ -1285,12 +1299,15 @@ msgstr "" #. module: account_financial_report #: model:ir.model.fields,help:account_financial_report.field_account_account__centralized -msgid "If flagged, no details will be displayed in the General Ledger report (the webkit one only), only centralized amounts per period." +msgid "" +"If flagged, no details will be displayed in the General Ledger report (the " +"webkit one only), only centralized amounts per period." msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header -msgid "Initial\n" +msgid "" +"Initial\n" " balance" msgstr "" @@ -1323,7 +1340,7 @@ msgid "Initial Debit" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1773,7 +1790,8 @@ msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_partner_ending_cumul -msgid "Partner\n" +msgid "" +"Partner\n" " cumul aged balance" msgstr "" @@ -1783,7 +1801,7 @@ msgid "Partner ID" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "" @@ -1795,7 +1813,7 @@ msgid "Partner cumul aged balance" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul @@ -1893,7 +1911,8 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines -msgid "Ref -\n" +msgid "" +"Ref -\n" " Label" msgstr "" @@ -2203,19 +2222,24 @@ msgstr "" #. module: account_financial_report #: code:addons/account_financial_report/wizard/general_ledger_wizard.py:180 #, python-format -msgid "The Company in the General Ledger Report Wizard and in Date Range must be the same." +msgid "" +"The Company in the General Ledger Report Wizard and in Date Range must be " +"the same." msgstr "" #. module: account_financial_report #: code:addons/account_financial_report/wizard/trial_balance_wizard.py:162 #, python-format -msgid "The Company in the Trial Balance Report Wizard and in Date Range must be the same." +msgid "" +"The Company in the Trial Balance Report Wizard and in Date Range must be the " +"same." msgstr "" #. module: account_financial_report #: code:addons/account_financial_report/wizard/vat_report_wizard.py:62 #, python-format -msgid "The Company in the Vat Report Wizard and in Date Range must be the same." +msgid "" +"The Company in the Vat Report Wizard and in Date Range must be the same." msgstr "" #. module: account_financial_report @@ -2266,7 +2290,9 @@ msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.trial_balance_wizard -msgid "Trial Balance can be computed only if selected company have only one unaffected earnings account." +msgid "" +"Trial Balance can be computed only if selected company have only one " +"unaffected earnings account." msgstr "" #. module: account_financial_report @@ -2277,7 +2303,10 @@ msgstr "" #. module: account_financial_report #: model:ir.model.fields,help:account_financial_report.field_general_ledger_report_wizard__hide_account_at_0 #: model:ir.model.fields,help:account_financial_report.field_open_items_report_wizard__hide_account_at_0 -msgid "Use this filter to hide an account or a partner with an ending balance at 0. If partners are filtered, debits and credits totals will not match the trial balance." +msgid "" +"Use this filter to hide an account or a partner with an ending balance at 0. " +"If partners are filtered, debits and credits totals will not match the trial " +"balance." msgstr "" #. module: account_financial_report @@ -2323,7 +2352,9 @@ msgstr "" #. module: account_financial_report #: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hide_account_at_0 -msgid "When this option is enabled, the trial balance will not display accounts that have initial balance = debit = credit = end balance = 0" +msgid "" +"When this option is enabled, the trial balance will not display accounts " +"that have initial balance = debit = credit = end balance = 0" msgstr "" #. module: account_financial_report diff --git a/account_financial_report/i18n/nl.po b/account_financial_report/i18n/nl.po index 9d8e32b1..5f34a611 100644 --- a/account_financial_report/i18n/nl.po +++ b/account_financial_report/i18n/nl.po @@ -980,7 +980,7 @@ msgstr "" " balans" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1389,7 +1389,7 @@ msgid "Initial Debit" msgstr "Beginbalans debet" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1859,7 +1859,7 @@ msgid "Partner ID" msgstr "Partner" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, fuzzy, python-format msgid "Partner Initial balance" msgstr "Proefbalans" @@ -1871,7 +1871,7 @@ msgid "Partner cumul aged balance" msgstr "Partner cumulatief ouderdomsanalyse" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/i18n/nl_NL.po b/account_financial_report/i18n/nl_NL.po index e2794b3e..52985d0c 100644 --- a/account_financial_report/i18n/nl_NL.po +++ b/account_financial_report/i18n/nl_NL.po @@ -955,7 +955,7 @@ msgid "" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1349,7 +1349,7 @@ msgid "Initial Debit" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1810,7 +1810,7 @@ msgid "Partner ID" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "" @@ -1822,7 +1822,7 @@ msgid "Partner cumul aged balance" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/i18n/pt.po b/account_financial_report/i18n/pt.po index 87d86919..71f9dca0 100644 --- a/account_financial_report/i18n/pt.po +++ b/account_financial_report/i18n/pt.po @@ -954,7 +954,7 @@ msgid "" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1348,7 +1348,7 @@ msgid "Initial Debit" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1809,7 +1809,7 @@ msgid "Partner ID" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "" @@ -1821,7 +1821,7 @@ msgid "Partner cumul aged balance" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/i18n/pt_BR.po b/account_financial_report/i18n/pt_BR.po index e56cfeb6..af874355 100644 --- a/account_financial_report/i18n/pt_BR.po +++ b/account_financial_report/i18n/pt_BR.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_financial_report +# * account_financial_report # msgid "" msgstr "" @@ -179,7 +179,8 @@ msgstr "90 Dias" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines -msgid "Age ≤ 120\n" +msgid "" +"Age ≤ 120\n" " d." msgstr "" "Idade ≤ 120\n" @@ -194,7 +195,8 @@ msgstr "Idade ≤ 120 d." #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines -msgid "Age ≤ 30\n" +msgid "" +"Age ≤ 30\n" " d." msgstr "" "Idade ≤ 30\n" @@ -209,7 +211,8 @@ msgstr "Idade ≤ 30 d." #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines -msgid "Age ≤ 60\n" +msgid "" +"Age ≤ 60\n" " d." msgstr "" "Idade ≤ 60\n" @@ -224,7 +227,8 @@ msgstr "Idade ≤ 60 d." #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines -msgid "Age ≤ 90\n" +msgid "" +"Age ≤ 90\n" " d." msgstr "" "Idade ≤ 90\n" @@ -508,12 +512,14 @@ msgstr "Contas Calculadas" #. module: account_financial_report #: model:ir.model.fields,help:account_financial_report.field_report_trial_balance__hierarchy_on #: 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" +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" +" 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" @@ -527,7 +533,8 @@ msgstr "" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines -msgid "Cost\n" +msgid "" +"Cost\n" " center" msgstr "" "Centro\n" @@ -911,7 +918,10 @@ msgstr "Nome de Exibição" #: model:ir.model.fields,help:account_financial_report.field_general_ledger_report_wizard__foreign_currency #: model:ir.model.fields,help:account_financial_report.field_open_items_report_wizard__foreign_currency #: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__foreign_currency -msgid "Display foreign currency for move lines, unless account currency is not setup through chart of accounts will display initial and final balance in that currency." +msgid "" +"Display foreign currency for move lines, unless account currency is not " +"setup through chart of accounts will display initial and final balance in " +"that currency." msgstr "" "Exibir moeda estrangeira para linhas de movimentos contábeis, a menos que a " "moeda da conta não esteja configurada no plano de contas mostrará os saldos " @@ -926,7 +936,8 @@ msgstr "Não exibir níveis pai" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines -msgid "Due\n" +msgid "" +"Due\n" " date" msgstr "" "Data de\n" @@ -951,14 +962,15 @@ msgstr "Data final" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul -msgid "Ending\n" +msgid "" +"Ending\n" " balance" msgstr "" "Saldo\n" " final" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1204,7 +1216,9 @@ msgstr "Razão Geral XLSX" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard -msgid "General Ledger can be computed only if selected company have only one unaffected earnings account." +msgid "" +"General Ledger can be computed only if selected company have only one " +"unaffected earnings account." msgstr "" "O Razão Geral somente pode ser calculado se a empresa selecionada tiver " "apenas uma conta de receitas não afetada." @@ -1311,14 +1325,17 @@ msgstr "ID" #. module: account_financial_report #: model:ir.model.fields,help:account_financial_report.field_account_account__centralized -msgid "If flagged, no details will be displayed in the General Ledger report (the webkit one only), only centralized amounts per period." +msgid "" +"If flagged, no details will be displayed in the General Ledger report (the " +"webkit one only), only centralized amounts per period." msgstr "" "Se marcado, os detalhes não serão exibidos no relatório Razão Geral (somente " "no webkit), apenas valores centralizados por período." #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header -msgid "Initial\n" +msgid "" +"Initial\n" " balance" msgstr "" "Saldo\n" @@ -1353,7 +1370,7 @@ msgid "Initial Debit" msgstr "Débito Inicial" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1803,7 +1820,8 @@ msgstr "Parceiro" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_partner_ending_cumul -msgid "Partner\n" +msgid "" +"Partner\n" " cumul aged balance" msgstr "" "Parceiro\n" @@ -1815,7 +1833,7 @@ msgid "Partner ID" msgstr "ID Parceiro" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, python-format msgid "Partner Initial balance" msgstr "Saldo inicial do parceiro" @@ -1827,7 +1845,7 @@ msgid "Partner cumul aged balance" msgstr "Saldo periódico acumulado do parceiro" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul @@ -1925,7 +1943,8 @@ msgstr "Apenas Contas a Receber" #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines -msgid "Ref -\n" +msgid "" +"Ref -\n" " Label" msgstr "" "Ref -\n" @@ -2237,7 +2256,9 @@ msgstr "Marcadores de Impostos" #. module: account_financial_report #: code:addons/account_financial_report/wizard/general_ledger_wizard.py:180 #, python-format -msgid "The Company in the General Ledger Report Wizard and in Date Range must be the same." +msgid "" +"The Company in the General Ledger Report Wizard and in Date Range must be " +"the same." msgstr "" "A Empresa no Assistente de Relatório Razão Geral e no Intervalo de Datas " "deve ser a mesma." @@ -2245,7 +2266,9 @@ msgstr "" #. module: account_financial_report #: code:addons/account_financial_report/wizard/trial_balance_wizard.py:162 #, python-format -msgid "The Company in the Trial Balance Report Wizard and in Date Range must be the same." +msgid "" +"The Company in the Trial Balance Report Wizard and in Date Range must be the " +"same." msgstr "" "A empresa no Assistente de Relatório Balancete e o Intervalo de Datas deve " "ser a mesma." @@ -2253,7 +2276,8 @@ msgstr "" #. module: account_financial_report #: code:addons/account_financial_report/wizard/vat_report_wizard.py:62 #, python-format -msgid "The Company in the Vat Report Wizard and in Date Range must be the same." +msgid "" +"The Company in the Vat Report Wizard and in Date Range must be the same." msgstr "" "A empresa no Assistente de Relatório de Impostos e o Intervalo de Datas deve " "ser a mesma." @@ -2306,7 +2330,9 @@ msgstr "Balancete XLSX" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.trial_balance_wizard -msgid "Trial Balance can be computed only if selected company have only one unaffected earnings account." +msgid "" +"Trial Balance can be computed only if selected company have only one " +"unaffected earnings account." msgstr "" "O Balancete poderá ser calculado somente se a empresa selecionada tiver " "apenas uma conta de receitas não afetada." @@ -2319,7 +2345,10 @@ msgstr "Conta de Receitas Não Afetada" #. module: account_financial_report #: model:ir.model.fields,help:account_financial_report.field_general_ledger_report_wizard__hide_account_at_0 #: model:ir.model.fields,help:account_financial_report.field_open_items_report_wizard__hide_account_at_0 -msgid "Use this filter to hide an account or a partner with an ending balance at 0. If partners are filtered, debits and credits totals will not match the trial balance." +msgid "" +"Use this filter to hide an account or a partner with an ending balance at 0. " +"If partners are filtered, debits and credits totals will not match the trial " +"balance." msgstr "" "Utilize este filtro para ocultar as contas ou empresas com saldo final " "zerado. Se houver parceiros filtrados, os totais de débitos e créditos não " @@ -2368,7 +2397,9 @@ msgstr "Visualizar" #. module: account_financial_report #: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hide_account_at_0 -msgid "When this option is enabled, the trial balance will not display accounts that have initial balance = debit = credit = end balance = 0" +msgid "" +"When this option is enabled, the trial balance will not display accounts " +"that have initial balance = debit = credit = end balance = 0" msgstr "" "Quando esta opção estiver ativa, o balancete não exibirá contas com saldo " "inicial = débito = crédito = saldo final = 0" diff --git a/account_financial_report/i18n/ro.po b/account_financial_report/i18n/ro.po index c72e5c3c..52e04b36 100644 --- a/account_financial_report/i18n/ro.po +++ b/account_financial_report/i18n/ro.po @@ -967,7 +967,7 @@ msgid "" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181 #: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 @@ -1368,7 +1368,7 @@ msgid "Initial Debit" msgstr "Debit inițial" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 @@ -1836,7 +1836,7 @@ msgid "Partner ID" msgstr "Partenr" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166 #, fuzzy, python-format msgid "Partner Initial balance" msgstr "Sold inițial" @@ -1848,7 +1848,7 @@ msgid "Partner cumul aged balance" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177 +#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178 #: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul diff --git a/account_financial_report/report/general_ledger_xlsx.py b/account_financial_report/report/general_ledger_xlsx.py index 1b55d8ce..6f1ffa06 100644 --- a/account_financial_report/report/general_ledger_xlsx.py +++ b/account_financial_report/report/general_ledger_xlsx.py @@ -154,7 +154,8 @@ class GeneralLedgerXslx(models.AbstractModel): self.row_pos += 1 # Display ending balance line for account - self.write_ending_balance(account) + if not report.filter_partner_ids: + self.write_ending_balance(account) # 2 lines break self.row_pos += 2 diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml index 5cb81eb6..a31b7aa2 100644 --- a/account_financial_report/report/templates/general_ledger.xml +++ b/account_financial_report/report/templates/general_ledger.xml @@ -67,7 +67,7 @@ - +