diff --git a/account_financial_report/README.rst b/account_financial_report/README.rst
index 9f04d5e8..c1846ecc 100644
--- a/account_financial_report/README.rst
+++ b/account_financial_report/README.rst
@@ -50,6 +50,13 @@ currency balances are not available.
Changelog
=========
+11.0.2.4.1 (2019-01-08)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* Handle better multicompany behaviour
+* Improve how title appears in the reports
+
+
11.0.2.3.1 (2018-11-29)
~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py
index 5ddf2a5c..1371b92b 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': '11.0.2.4.0',
+ 'version': '11.0.2.4.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 ac3a3419..aef32804 100644
--- a/account_financial_report/i18n/account_financial_report.pot
+++ b/account_financial_report/i18n/account_financial_report.pot
@@ -245,7 +245,7 @@ msgid "Aged Partner Balance XLSX"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr ""
@@ -411,7 +411,7 @@ msgid "Centralized"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr ""
@@ -703,7 +703,7 @@ msgstr ""
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -945,7 +945,7 @@ msgid "Entry"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr ""
@@ -1319,7 +1319,7 @@ msgstr ""
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1595,7 +1595,7 @@ msgid "No"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, python-format
msgid "No group"
msgstr ""
@@ -1614,8 +1614,8 @@ msgid "No limit"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1623,7 +1623,7 @@ msgid "No partner allocated"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr ""
@@ -1834,7 +1834,7 @@ msgid "Periods"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr ""
@@ -2162,19 +2162,19 @@ msgid "Taxtags"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
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:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
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:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid "The Company in the Vat Report Wizard and in Date Range must be the same."
msgstr ""
diff --git a/account_financial_report/i18n/ar.po b/account_financial_report/i18n/ar.po
index bacaac33..450291c6 100644
--- a/account_financial_report/i18n/ar.po
+++ b/account_financial_report/i18n/ar.po
@@ -253,7 +253,7 @@ msgid "Aged Partner Balance XLSX"
msgstr "تحليل رصيد الشركاء إكسل"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr "الكل"
@@ -419,7 +419,7 @@ msgid "Centralized"
msgstr "مجمّع"
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr "القيود المجمّعة"
@@ -714,7 +714,7 @@ msgstr "الحالي"
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -961,7 +961,7 @@ msgid "Entry"
msgstr "القيد"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr "رقم القيد"
@@ -1348,7 +1348,7 @@ msgstr "حساب شريك"
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1625,7 +1625,7 @@ msgid "No"
msgstr "لا"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, python-format
msgid "No group"
msgstr "بدون تجميع"
@@ -1645,8 +1645,8 @@ msgid "No limit"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1654,7 +1654,7 @@ msgid "No partner allocated"
msgstr "لم يتم تخصيص شريك"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr "غير مرحّل"
@@ -1868,7 +1868,7 @@ msgid "Periods"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr ""
@@ -2197,7 +2197,7 @@ msgid "Taxtags"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
msgid ""
"The Company in the General Ledger Report Wizard and in Date Range must be "
@@ -2205,7 +2205,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
msgid ""
"The Company in the Trial Balance Report Wizard and in Date Range must be the "
@@ -2213,7 +2213,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid ""
"The Company in the Vat Report Wizard and in Date Range must be the same."
diff --git a/account_financial_report/i18n/ca.po b/account_financial_report/i18n/ca.po
index c5535bc8..ecc0ad1a 100644
--- a/account_financial_report/i18n/ca.po
+++ b/account_financial_report/i18n/ca.po
@@ -255,7 +255,7 @@ msgid "Aged Partner Balance XLSX"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr ""
@@ -422,7 +422,7 @@ msgid "Centralized"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr ""
@@ -718,7 +718,7 @@ msgstr ""
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -965,7 +965,7 @@ msgid "Entry"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr ""
@@ -1344,7 +1344,7 @@ msgstr ""
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1620,7 +1620,7 @@ msgid "No"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, python-format
msgid "No group"
msgstr ""
@@ -1639,8 +1639,8 @@ msgid "No limit"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1648,7 +1648,7 @@ msgid "No partner allocated"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr ""
@@ -1861,7 +1861,7 @@ msgid "Periods"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr ""
@@ -2191,7 +2191,7 @@ msgid "Taxtags"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
msgid ""
"The Company in the General Ledger Report Wizard and in Date Range must be "
@@ -2199,7 +2199,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
msgid ""
"The Company in the Trial Balance Report Wizard and in Date Range must be the "
@@ -2207,7 +2207,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid ""
"The Company in the Vat Report Wizard and in Date Range must be the same."
diff --git a/account_financial_report/i18n/de.po b/account_financial_report/i18n/de.po
index d10682b2..daa31396 100644
--- a/account_financial_report/i18n/de.po
+++ b/account_financial_report/i18n/de.po
@@ -266,7 +266,7 @@ msgid "Aged Partner Balance XLSX"
msgstr "Partnersalden n. Alter XLSX"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr "Alle"
@@ -435,7 +435,7 @@ msgid "Centralized"
msgstr "Abgestimmt"
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr "Abgestimmte Posten"
@@ -731,7 +731,7 @@ msgstr "Ist-Summe"
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -982,7 +982,7 @@ msgid "Entry"
msgstr "Posten"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr ""
@@ -1380,7 +1380,7 @@ msgstr "Ist Partnerkonto"
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1662,7 +1662,7 @@ msgid "No"
msgstr "Nein"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, fuzzy, python-format
msgid "No group"
msgstr "Steuerklasse"
@@ -1682,8 +1682,8 @@ msgid "No limit"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1691,7 +1691,7 @@ msgid "No partner allocated"
msgstr "Kein Partner zugewiesen"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr ""
@@ -1905,7 +1905,7 @@ msgid "Periods"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr ""
@@ -2244,7 +2244,7 @@ msgid "Taxtags"
msgstr "Steuer-Stichwörter"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
msgid ""
"The Company in the General Ledger Report Wizard and in Date Range must be "
@@ -2252,7 +2252,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
msgid ""
"The Company in the Trial Balance Report Wizard and in Date Range must be the "
@@ -2260,7 +2260,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid ""
"The Company in the Vat Report Wizard and in Date Range must be the same."
diff --git a/account_financial_report/i18n/es.po b/account_financial_report/i18n/es.po
index e2ff495f..893f5ef7 100644
--- a/account_financial_report/i18n/es.po
+++ b/account_financial_report/i18n/es.po
@@ -258,7 +258,7 @@ msgid "Aged Partner Balance XLSX"
msgstr "Saldo vencidos de empresa XLSX"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr "Todos"
@@ -424,7 +424,7 @@ msgid "Centralized"
msgstr "Centralizado"
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr "Centralizar las entradas"
@@ -727,7 +727,7 @@ msgstr "Actual"
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -981,7 +981,7 @@ msgid "Entry"
msgstr "Asiento"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr "Número de asiento"
@@ -1367,7 +1367,7 @@ msgstr "Es cuenta de Asociado"
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1644,7 +1644,7 @@ msgid "No"
msgstr "No"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, python-format
msgid "No group"
msgstr "Sin grupo"
@@ -1663,8 +1663,8 @@ msgid "No limit"
msgstr "Sin límite"
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1672,7 +1672,7 @@ msgid "No partner allocated"
msgstr "Empresa sin asignar"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr "Sin Postear"
@@ -1885,7 +1885,7 @@ msgid "Periods"
msgstr "Periodos"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr "Posteado"
@@ -2214,7 +2214,7 @@ msgid "Taxtags"
msgstr "Etiquetas de impuestos"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
msgid ""
"The Company in the General Ledger Report Wizard and in Date Range must be "
@@ -2222,7 +2222,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
msgid ""
"The Company in the Trial Balance Report Wizard and in Date Range must be the "
@@ -2230,7 +2230,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid ""
"The Company in the Vat Report Wizard and in Date Range must be the same."
diff --git a/account_financial_report/i18n/fr.po b/account_financial_report/i18n/fr.po
index b4935bd5..63059c32 100644
--- a/account_financial_report/i18n/fr.po
+++ b/account_financial_report/i18n/fr.po
@@ -257,7 +257,7 @@ msgid "Aged Partner Balance XLSX"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr ""
@@ -424,7 +424,7 @@ msgid "Centralized"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr ""
@@ -720,7 +720,7 @@ msgstr ""
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -967,7 +967,7 @@ msgid "Entry"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr ""
@@ -1346,7 +1346,7 @@ msgstr ""
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1622,7 +1622,7 @@ msgid "No"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, python-format
msgid "No group"
msgstr ""
@@ -1641,8 +1641,8 @@ msgid "No limit"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1650,7 +1650,7 @@ msgid "No partner allocated"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr ""
@@ -1863,7 +1863,7 @@ msgid "Periods"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr ""
@@ -2194,7 +2194,7 @@ msgid "Taxtags"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
msgid ""
"The Company in the General Ledger Report Wizard and in Date Range must be "
@@ -2202,7 +2202,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
msgid ""
"The Company in the Trial Balance Report Wizard and in Date Range must be the "
@@ -2210,7 +2210,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid ""
"The Company in the Vat Report Wizard and in Date Range must be the same."
diff --git a/account_financial_report/i18n/hr_HR.po b/account_financial_report/i18n/hr_HR.po
index 2f6baa26..4e7e99c5 100644
--- a/account_financial_report/i18n/hr_HR.po
+++ b/account_financial_report/i18n/hr_HR.po
@@ -259,7 +259,7 @@ msgid "Aged Partner Balance XLSX"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr ""
@@ -426,7 +426,7 @@ msgid "Centralized"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr ""
@@ -722,7 +722,7 @@ msgstr ""
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -969,7 +969,7 @@ msgid "Entry"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr ""
@@ -1348,7 +1348,7 @@ msgstr ""
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1624,7 +1624,7 @@ msgid "No"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, python-format
msgid "No group"
msgstr ""
@@ -1643,8 +1643,8 @@ msgid "No limit"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1652,7 +1652,7 @@ msgid "No partner allocated"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr ""
@@ -1865,7 +1865,7 @@ msgid "Periods"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr ""
@@ -2196,7 +2196,7 @@ msgid "Taxtags"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
msgid ""
"The Company in the General Ledger Report Wizard and in Date Range must be "
@@ -2204,7 +2204,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
msgid ""
"The Company in the Trial Balance Report Wizard and in Date Range must be the "
@@ -2212,7 +2212,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid ""
"The Company in the Vat Report Wizard and in Date Range must be the same."
diff --git a/account_financial_report/i18n/it.po b/account_financial_report/i18n/it.po
index ba968b24..7604f995 100644
--- a/account_financial_report/i18n/it.po
+++ b/account_financial_report/i18n/it.po
@@ -256,7 +256,7 @@ msgid "Aged Partner Balance XLSX"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr ""
@@ -423,7 +423,7 @@ msgid "Centralized"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr ""
@@ -719,7 +719,7 @@ msgstr ""
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -966,7 +966,7 @@ msgid "Entry"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr ""
@@ -1353,7 +1353,7 @@ msgstr ""
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1630,7 +1630,7 @@ msgid "No"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, python-format
msgid "No group"
msgstr ""
@@ -1649,8 +1649,8 @@ msgid "No limit"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1658,7 +1658,7 @@ msgid "No partner allocated"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr ""
@@ -1872,7 +1872,7 @@ msgid "Periods"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr ""
@@ -2202,7 +2202,7 @@ msgid "Taxtags"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
msgid ""
"The Company in the General Ledger Report Wizard and in Date Range must be "
@@ -2210,7 +2210,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
msgid ""
"The Company in the Trial Balance Report Wizard and in Date Range must be the "
@@ -2218,7 +2218,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid ""
"The Company in the Vat Report Wizard and in Date Range must be the same."
diff --git a/account_financial_report/i18n/nl.po b/account_financial_report/i18n/nl.po
index 33d03498..70805cd0 100644
--- a/account_financial_report/i18n/nl.po
+++ b/account_financial_report/i18n/nl.po
@@ -264,7 +264,7 @@ msgid "Aged Partner Balance XLSX"
msgstr "Ouderdomsanalyse XLSX"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr "Alle"
@@ -431,7 +431,7 @@ msgid "Centralized"
msgstr "Gecentraliseerd"
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr "Gecentraliseerde boekingen"
@@ -729,7 +729,7 @@ msgstr "Huidig"
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -983,7 +983,7 @@ msgid "Entry"
msgstr "Boeking"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr "Boekingsnummer"
@@ -1377,7 +1377,7 @@ msgstr "Is partner rekening"
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1654,7 +1654,7 @@ msgid "No"
msgstr "Nee"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, python-format
msgid "No group"
msgstr "Geen groep"
@@ -1674,8 +1674,8 @@ msgid "No limit"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1683,7 +1683,7 @@ msgid "No partner allocated"
msgstr "Geen partner toegewezen"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr "Ongeboekt"
@@ -1899,7 +1899,7 @@ msgid "Periods"
msgstr "Periodes"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr "Geboekt"
@@ -2230,7 +2230,7 @@ msgid "Taxtags"
msgstr "Belasting labels"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
msgid ""
"The Company in the General Ledger Report Wizard and in Date Range must be "
@@ -2238,7 +2238,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
msgid ""
"The Company in the Trial Balance Report Wizard and in Date Range must be the "
@@ -2246,7 +2246,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid ""
"The Company in the Vat Report Wizard and in Date Range must be the same."
diff --git a/account_financial_report/i18n/nl_NL.po b/account_financial_report/i18n/nl_NL.po
index b1d63e1d..d4f1c10d 100644
--- a/account_financial_report/i18n/nl_NL.po
+++ b/account_financial_report/i18n/nl_NL.po
@@ -258,7 +258,7 @@ msgid "Aged Partner Balance XLSX"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr ""
@@ -425,7 +425,7 @@ msgid "Centralized"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr ""
@@ -721,7 +721,7 @@ msgstr ""
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -968,7 +968,7 @@ msgid "Entry"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr ""
@@ -1347,7 +1347,7 @@ msgstr ""
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1623,7 +1623,7 @@ msgid "No"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, python-format
msgid "No group"
msgstr ""
@@ -1642,8 +1642,8 @@ msgid "No limit"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1651,7 +1651,7 @@ msgid "No partner allocated"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr ""
@@ -1864,7 +1864,7 @@ msgid "Periods"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr ""
@@ -2193,7 +2193,7 @@ msgid "Taxtags"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
msgid ""
"The Company in the General Ledger Report Wizard and in Date Range must be "
@@ -2201,7 +2201,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
msgid ""
"The Company in the Trial Balance Report Wizard and in Date Range must be the "
@@ -2209,7 +2209,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid ""
"The Company in the Vat Report Wizard and in Date Range must be the same."
diff --git a/account_financial_report/i18n/pt.po b/account_financial_report/i18n/pt.po
index d196c73b..eb4b7f85 100644
--- a/account_financial_report/i18n/pt.po
+++ b/account_financial_report/i18n/pt.po
@@ -257,7 +257,7 @@ msgid "Aged Partner Balance XLSX"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr ""
@@ -424,7 +424,7 @@ msgid "Centralized"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr ""
@@ -720,7 +720,7 @@ msgstr ""
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -967,7 +967,7 @@ msgid "Entry"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr ""
@@ -1346,7 +1346,7 @@ msgstr ""
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1622,7 +1622,7 @@ msgid "No"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, python-format
msgid "No group"
msgstr ""
@@ -1641,8 +1641,8 @@ msgid "No limit"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1650,7 +1650,7 @@ msgid "No partner allocated"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr ""
@@ -1863,7 +1863,7 @@ msgid "Periods"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr ""
@@ -2194,7 +2194,7 @@ msgid "Taxtags"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
msgid ""
"The Company in the General Ledger Report Wizard and in Date Range must be "
@@ -2202,7 +2202,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
msgid ""
"The Company in the Trial Balance Report Wizard and in Date Range must be the "
@@ -2210,7 +2210,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid ""
"The Company in the Vat Report Wizard and in Date Range must be the same."
diff --git a/account_financial_report/i18n/ro.po b/account_financial_report/i18n/ro.po
index 530fbd4b..d4e3f081 100644
--- a/account_financial_report/i18n/ro.po
+++ b/account_financial_report/i18n/ro.po
@@ -262,7 +262,7 @@ msgid "Aged Partner Balance XLSX"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:68
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
#, python-format
msgid "All"
msgstr "Tot"
@@ -430,7 +430,7 @@ msgid "Centralized"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1433
+#: code:addons/account_financial_report/report/general_ledger.py:1432
#, python-format
msgid "Centralized Entries"
msgstr ""
@@ -726,7 +726,7 @@ msgstr "Curent"
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:21
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
#: code:addons/account_financial_report/report/open_items_xlsx.py:19
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:73
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_date
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_date
@@ -973,7 +973,7 @@ msgid "Entry"
msgstr "Înregistrare"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:76
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:72
#, python-format
msgid "Entry number"
msgstr "Număr înregistrare"
@@ -1360,7 +1360,7 @@ msgstr ""
#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:67
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:23
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:83
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:79
#: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_journal
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_journal
@@ -1638,7 +1638,7 @@ msgid "No"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:84
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:80
#, python-format
msgid "No group"
msgstr ""
@@ -1657,8 +1657,8 @@ msgid "No limit"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:758
-#: code:addons/account_financial_report/report/general_ledger.py:1137
+#: code:addons/account_financial_report/report/general_ledger.py:757
+#: code:addons/account_financial_report/report/general_ledger.py:1136
#: code:addons/account_financial_report/report/open_items.py:306
#: code:addons/account_financial_report/report/open_items.py:555
#, python-format
@@ -1666,7 +1666,7 @@ msgid "No partner allocated"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:66
#, python-format
msgid "Not Posted"
msgstr "Nepostat"
@@ -1880,7 +1880,7 @@ msgid "Periods"
msgstr "Perioade"
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:69
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:65
#, python-format
msgid "Posted"
msgstr "Postat"
@@ -2210,7 +2210,7 @@ msgid "Taxtags"
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:130
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:153
#, python-format
msgid ""
"The Company in the General Ledger Report Wizard and in Date Range must be "
@@ -2218,7 +2218,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:135
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:161
#, python-format
msgid ""
"The Company in the Trial Balance Report Wizard and in Date Range must be the "
@@ -2226,7 +2226,7 @@ msgid ""
msgstr ""
#. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:51
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:61
#, python-format
msgid ""
"The Company in the Vat Report Wizard and in Date Range must be the same."
diff --git a/account_financial_report/readme/HISTORY.rst b/account_financial_report/readme/HISTORY.rst
index b501c36d..4062d70c 100644
--- a/account_financial_report/readme/HISTORY.rst
+++ b/account_financial_report/readme/HISTORY.rst
@@ -1,3 +1,10 @@
+11.0.2.4.1 (2019-01-08)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* Handle better multicompany behaviour
+* Improve how title appears in the reports
+
+
11.0.2.3.1 (2018-11-29)
~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py
index 7c882aff..20db5299 100644
--- a/account_financial_report/report/general_ledger.py
+++ b/account_financial_report/report/general_ledger.py
@@ -254,7 +254,6 @@ class GeneralLedgerReportCompute(models.TransientModel):
self._inject_partner_values()
if not self.filter_partner_ids:
self._inject_partner_values(only_empty_partner=True)
-
# Add unaffected earnings account
if (not self.filter_account_ids or
self.unaffected_earnings_account.id in
diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml
index ef00fe00..eff0b6f2 100644
--- a/account_financial_report/report/templates/aged_partner_balance.xml
+++ b/account_financial_report/report/templates/aged_partner_balance.xml
@@ -17,9 +17,9 @@
Aged Partner Balance - -
-
+
-
+
diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml
index 2656e016..ff03ca33 100644
--- a/account_financial_report/report/templates/general_ledger.xml
+++ b/account_financial_report/report/templates/general_ledger.xml
@@ -19,9 +19,9 @@
General Ledger - -
-
+
-
+
diff --git a/account_financial_report/report/templates/journal_ledger.xml b/account_financial_report/report/templates/journal_ledger.xml
index c321a6d4..8d04fb35 100644
--- a/account_financial_report/report/templates/journal_ledger.xml
+++ b/account_financial_report/report/templates/journal_ledger.xml
@@ -16,9 +16,9 @@
Journal Ledger - -
-
+
-
+
diff --git a/account_financial_report/report/templates/open_items.xml b/account_financial_report/report/templates/open_items.xml
index 5f1c0269..193c2d73 100644
--- a/account_financial_report/report/templates/open_items.xml
+++ b/account_financial_report/report/templates/open_items.xml
@@ -17,9 +17,9 @@
Open Items - -
-
+
-
+
diff --git a/account_financial_report/report/templates/trial_balance.xml b/account_financial_report/report/templates/trial_balance.xml
index c2cdf593..869ba9e3 100644
--- a/account_financial_report/report/templates/trial_balance.xml
+++ b/account_financial_report/report/templates/trial_balance.xml
@@ -19,9 +19,9 @@
Trial Balance - -
-
+
-
+
diff --git a/account_financial_report/report/templates/vat_report.xml b/account_financial_report/report/templates/vat_report.xml
index 2291e3f3..a7b963eb 100644
--- a/account_financial_report/report/templates/vat_report.xml
+++ b/account_financial_report/report/templates/vat_report.xml
@@ -14,9 +14,9 @@
VAT Report - -
-
+
-
+
diff --git a/account_financial_report/static/description/index.html b/account_financial_report/static/description/index.html
index 8ef2593f..7960eba2 100644
--- a/account_financial_report/static/description/index.html
+++ b/account_financial_report/static/description/index.html
@@ -386,23 +386,31 @@ currency balances are not available.
Table of contents
-
+
-
+
+
+Handle better multicompany behaviour
+Improve how title appears in the reports
+
+
+
+
In the Trial Balance you can apply a filter by hierarchy levels
In the General Ledger you can apply a filter by Analytic Tag
@@ -411,7 +419,7 @@ currency balances are not available.
-
+
Bugs are tracked on GitHub Issues .
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
@@ -419,9 +427,9 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
Do not contact contributors directly about support or help with technical issues.
-
+
-
+
Camptocamp SA
initOS GmbH
@@ -430,7 +438,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
-
+
This module is maintained by the OCA.
OCA, or the Odoo Community Association, is a nonprofit organization whose
diff --git a/account_financial_report/wizard/aged_partner_balance_wizard.py b/account_financial_report/wizard/aged_partner_balance_wizard.py
index c192c24b..d75b94d9 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard.py
+++ b/account_financial_report/wizard/aged_partner_balance_wizard.py
@@ -17,7 +17,7 @@ class AgedPartnerBalanceWizard(models.TransientModel):
company_id = fields.Many2one(
comodel_name='res.company',
default=lambda self: self.env.user.company_id,
- required=True,
+ required=False,
string='Company'
)
date_at = fields.Date(required=True,
@@ -47,8 +47,22 @@ class AgedPartnerBalanceWizard(models.TransientModel):
lambda p: p.company_id == self.company_id or
not p.company_id)
if self.company_id and self.account_ids:
- self.account_ids = self.account_ids.filtered(
- lambda a: a.company_id == self.company_id)
+ if self.receivable_accounts_only or self.payable_accounts_only:
+ self.onchange_type_accounts_only()
+ else:
+ self.account_ids = self.account_ids.filtered(
+ lambda a: a.company_id == self.company_id)
+ res = {'domain': {'account_ids': [],
+ 'partner_ids': []}}
+ if not self.company_id:
+ return res
+ else:
+ res['domain']['account_ids'] += [
+ ('company_id', '=', self.company_id.id)]
+ res['domain']['partner_ids'] += [
+ '|', ('company_id', '=', self.company_id.id),
+ ('company_id', '=', False)]
+ return res
@api.onchange('receivable_accounts_only', 'payable_accounts_only')
def onchange_type_accounts_only(self):
diff --git a/account_financial_report/wizard/aged_partner_balance_wizard_view.xml b/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
index 0b8c5863..52206119 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
+++ b/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
@@ -23,8 +23,7 @@
+ options="{'no_create': True}"/>
@@ -33,7 +32,6 @@
diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py
index 85396d6a..611c9c01 100644
--- a/account_financial_report/wizard/general_ledger_wizard.py
+++ b/account_financial_report/wizard/general_ledger_wizard.py
@@ -22,7 +22,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
company_id = fields.Many2one(
comodel_name='res.company',
default=lambda self: self.env.user.company_id,
- required=True,
+ required=False,
string='Company'
)
date_range_id = fields.Many2one(
@@ -108,11 +108,34 @@ class GeneralLedgerReportWizard(models.TransientModel):
lambda p: p.company_id == self.company_id or
not p.company_id)
if self.company_id and self.account_ids:
- self.account_ids = self.account_ids.filtered(
- lambda a: a.company_id == self.company_id)
+ if self.receivable_accounts_only or self.payable_accounts_only:
+ self.onchange_type_accounts_only()
+ else:
+ self.account_ids = self.account_ids.filtered(
+ lambda a: a.company_id == self.company_id)
if self.company_id and self.cost_center_ids:
self.cost_center_ids = self.cost_center_ids.filtered(
lambda c: c.company_id == self.company_id)
+ res = {'domain': {'account_ids': [],
+ 'partner_ids': [],
+ 'cost_center_ids': [],
+ 'date_range_id': []
+ }
+ }
+ if not self.company_id:
+ return res
+ else:
+ res['domain']['account_ids'] += [
+ ('company_id', '=', self.company_id.id)]
+ res['domain']['partner_ids'] += [
+ '|', ('company_id', '=', self.company_id.id),
+ ('company_id', '=', False)]
+ res['domain']['cost_center_ids'] += [
+ ('company_id', '=', self.company_id.id)]
+ res['domain']['date_range_id'] += [
+ '|', ('company_id', '=', self.company_id.id),
+ ('company_id', '=', False)]
+ return res
@api.onchange('date_range_id')
def onchange_date_range_id(self):
diff --git a/account_financial_report/wizard/general_ledger_wizard_view.xml b/account_financial_report/wizard/general_ledger_wizard_view.xml
index 225eaac2..f54cb955 100644
--- a/account_financial_report/wizard/general_ledger_wizard_view.xml
+++ b/account_financial_report/wizard/general_ledger_wizard_view.xml
@@ -13,8 +13,7 @@
-
+
@@ -36,19 +35,16 @@
+ options="{'no_create': True}"/>
diff --git a/account_financial_report/wizard/journal_ledger_wizard.py b/account_financial_report/wizard/journal_ledger_wizard.py
index bc70430b..3bbfb407 100644
--- a/account_financial_report/wizard/journal_ledger_wizard.py
+++ b/account_financial_report/wizard/journal_ledger_wizard.py
@@ -16,15 +16,12 @@ class JournalLedgerReportWizard(models.TransientModel):
comodel_name='res.company',
default=lambda self: self.env.user.company_id,
string='Company',
- required=True,
+ required=False,
ondelete='cascade',
)
date_range_id = fields.Many2one(
comodel_name='date.range',
string='Date range',
- domain="['|', "
- "('company_id', '=', False),"
- "('company_id', '=', company_id)]",
)
date_from = fields.Date(
string="Start date",
@@ -37,7 +34,6 @@ class JournalLedgerReportWizard(models.TransientModel):
journal_ids = fields.Many2many(
comodel_name='account.journal',
string="Journals",
- domain="[('company_id', '=', company_id)]",
required=False,
)
move_target = fields.Selection(
@@ -89,6 +85,23 @@ class JournalLedgerReportWizard(models.TransientModel):
self.date_from = self.date_range_id.date_start
self.date_to = self.date_range_id.date_end
+ @api.onchange('company_id')
+ def onchange_company_id(self):
+ """Handle company change."""
+ if self.company_id and self.date_range_id.company_id and \
+ self.date_range_id.company_id != self.company_id:
+ self.date_range_id = False
+ if self.company_id and self.journal_ids:
+ self.journal_ids = self.journal_ids.filtered(
+ lambda p: p.company_id == self.company_id or not p.company_id)
+ res = {'domain': {'journal_ids': []}}
+ if not self.company_id:
+ return res
+ else:
+ res['domain']['journal_ids'] += [
+ ('company_id', '=', self.company_id.id)]
+ return res
+
@api.multi
def button_export_html(self):
self.ensure_one()
diff --git a/account_financial_report/wizard/open_items_wizard.py b/account_financial_report/wizard/open_items_wizard.py
index 804a8efe..02b89433 100644
--- a/account_financial_report/wizard/open_items_wizard.py
+++ b/account_financial_report/wizard/open_items_wizard.py
@@ -17,7 +17,7 @@ class OpenItemsReportWizard(models.TransientModel):
company_id = fields.Many2one(
comodel_name='res.company',
default=lambda self: self.env.user.company_id,
- required=True,
+ required=False,
string='Company'
)
date_at = fields.Date(required=True,
@@ -60,8 +60,22 @@ class OpenItemsReportWizard(models.TransientModel):
lambda p: p.company_id == self.company_id or
not p.company_id)
if self.company_id and self.account_ids:
- self.account_ids = self.account_ids.filtered(
- lambda a: a.company_id == self.company_id)
+ if self.receivable_accounts_only or self.payable_accounts_only:
+ self.onchange_type_accounts_only()
+ else:
+ self.account_ids = self.account_ids.filtered(
+ lambda a: a.company_id == self.company_id)
+ res = {'domain': {'account_ids': [],
+ 'partner_ids': []}}
+ if not self.company_id:
+ return res
+ else:
+ res['domain']['account_ids'] += [
+ ('company_id', '=', self.company_id.id)]
+ res['domain']['partner_ids'] += [
+ '|', ('company_id', '=', self.company_id.id),
+ ('company_id', '=', False)]
+ return res
@api.onchange('receivable_accounts_only', 'payable_accounts_only')
def onchange_type_accounts_only(self):
diff --git a/account_financial_report/wizard/open_items_wizard_view.xml b/account_financial_report/wizard/open_items_wizard_view.xml
index 1366799b..f5df881b 100644
--- a/account_financial_report/wizard/open_items_wizard_view.xml
+++ b/account_financial_report/wizard/open_items_wizard_view.xml
@@ -24,7 +24,6 @@
@@ -34,7 +33,6 @@
diff --git a/account_financial_report/wizard/trial_balance_wizard.py b/account_financial_report/wizard/trial_balance_wizard.py
index cd8cabe6..655d4a1f 100644
--- a/account_financial_report/wizard/trial_balance_wizard.py
+++ b/account_financial_report/wizard/trial_balance_wizard.py
@@ -19,7 +19,7 @@ class TrialBalanceReportWizard(models.TransientModel):
company_id = fields.Many2one(
comodel_name='res.company',
default=lambda self: self.env.user.company_id,
- required=True,
+ required=False,
string='Company'
)
date_range_id = fields.Many2one(
@@ -115,9 +115,35 @@ class TrialBalanceReportWizard(models.TransientModel):
self.partner_ids = self.partner_ids.filtered(
lambda p: p.company_id == self.company_id or
not p.company_id)
- if self.company_id and self.account_ids:
- self.account_ids = self.account_ids.filtered(
+ if self.company_id and self.journal_ids:
+ self.journal_ids = self.journal_ids.filtered(
lambda a: a.company_id == self.company_id)
+ if self.company_id and self.account_ids:
+ if self.receivable_accounts_only or self.payable_accounts_only:
+ self.onchange_type_accounts_only()
+ else:
+ self.account_ids = self.account_ids.filtered(
+ lambda a: a.company_id == self.company_id)
+ res = {'domain': {'account_ids': [],
+ 'partner_ids': [],
+ 'date_range_id': [],
+ 'journal_ids': [],
+ }
+ }
+ if not self.company_id:
+ return res
+ else:
+ res['domain']['account_ids'] += [
+ ('company_id', '=', self.company_id.id)]
+ res['domain']['partner_ids'] += [
+ '|', ('company_id', '=', self.company_id.id),
+ ('company_id', '=', False)]
+ res['domain']['date_range_id'] += [
+ '|', ('company_id', '=', self.company_id.id),
+ ('company_id', '=', False)]
+ res['domain']['journal_ids'] += [
+ ('company_id', '=', self.company_id.id)]
+ return res
@api.onchange('date_range_id')
def onchange_date_range_id(self):
diff --git a/account_financial_report/wizard/trial_balance_wizard_view.xml b/account_financial_report/wizard/trial_balance_wizard_view.xml
index efc763ad..a95d2acd 100644
--- a/account_financial_report/wizard/trial_balance_wizard_view.xml
+++ b/account_financial_report/wizard/trial_balance_wizard_view.xml
@@ -13,7 +13,7 @@
-
+
@@ -32,14 +32,12 @@
@@ -52,7 +50,6 @@
diff --git a/account_financial_report/wizard/vat_report_wizard.py b/account_financial_report/wizard/vat_report_wizard.py
index 0878bba4..2f78525b 100644
--- a/account_financial_report/wizard/vat_report_wizard.py
+++ b/account_financial_report/wizard/vat_report_wizard.py
@@ -13,7 +13,7 @@ class VATReportWizard(models.TransientModel):
company_id = fields.Many2one(
comodel_name='res.company',
default=lambda self: self.env.user.company_id,
- required=True,
+ required=False,
string='Company'
)
date_range_id = fields.Many2one(
@@ -34,6 +34,16 @@ class VATReportWizard(models.TransientModel):
if self.company_id and self.date_range_id.company_id and \
self.date_range_id.company_id != self.company_id:
self.date_range_id = False
+ res = {'domain': {'date_range_id': [],
+ }
+ }
+ if not self.company_id:
+ return res
+ else:
+ res['domain']['date_range_id'] += [
+ '|', ('company_id', '=', self.company_id.id),
+ ('company_id', '=', False)]
+ return res
@api.onchange('date_range_id')
def onchange_date_range_id(self):
diff --git a/account_financial_report/wizard/vat_report_wizard_view.xml b/account_financial_report/wizard/vat_report_wizard_view.xml
index 6e716c46..0b360fa3 100755
--- a/account_financial_report/wizard/vat_report_wizard_view.xml
+++ b/account_financial_report/wizard/vat_report_wizard_view.xml
@@ -11,7 +11,7 @@
-
+