diff --git a/account_financial_report/report/aged_partner_balance.py b/account_financial_report/report/aged_partner_balance.py index aa1a7176..0ded56b4 100644 --- a/account_financial_report/report/aged_partner_balance.py +++ b/account_financial_report/report/aged_partner_balance.py @@ -369,6 +369,7 @@ class AgedPartnerBalanceReport(models.AbstractModel): "doc_model": "open.items.report.wizard", "docs": self.env["open.items.report.wizard"].browse(wizard_id), "company_name": company.display_name, + "company_currency": company.currency_id, "currency_name": company.currency_id.name, "date_at": date_at, "only_posted_moves": only_posted_moves, diff --git a/account_financial_report/report/open_items.py b/account_financial_report/report/open_items.py index 8a026bcb..52c7d985 100644 --- a/account_financial_report/report/open_items.py +++ b/account_financial_report/report/open_items.py @@ -258,6 +258,7 @@ class OpenItemsReport(models.AbstractModel): "foreign_currency": data["foreign_currency"], "show_partner_details": data["show_partner_details"], "company_name": company.display_name, + "company_currency": company.currency_id, "currency_name": company.currency_id.name, "date_at": date_at_object.strftime("%d/%m/%Y"), "hide_account_at_0": data["hide_account_at_0"], diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml index d7cf9de6..8e5aaab1 100644 --- a/account_financial_report/report/templates/aged_partner_balance.xml +++ b/account_financial_report/report/templates/aged_partner_balance.xml @@ -137,49 +137,49 @@
@@ -315,7 +315,7 @@ > @@ -324,7 +324,7 @@ @@ -334,7 +334,7 @@ > @@ -344,7 +344,7 @@ @@ -354,7 +354,7 @@ > @@ -364,7 +364,7 @@ @@ -374,7 +374,7 @@ > @@ -384,7 +384,7 @@ @@ -394,7 +394,7 @@ > @@ -404,7 +404,7 @@ @@ -414,7 +414,7 @@ > @@ -424,7 +424,7 @@ @@ -434,7 +434,7 @@ > @@ -456,49 +456,49 @@
@@ -515,49 +515,49 @@
@@ -570,49 +570,49 @@
diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml index e4553f1b..5fec57cd 100644 --- a/account_financial_report/report/templates/general_ledger.xml +++ b/account_financial_report/report/templates/general_ledger.xml @@ -229,7 +229,7 @@
@@ -244,7 +244,7 @@
@@ -261,7 +261,7 @@
@@ -276,7 +276,7 @@
@@ -292,7 +292,7 @@
@@ -306,7 +306,7 @@ @@ -516,7 +516,7 @@ > @@ -524,7 +524,7 @@ @@ -539,7 +539,7 @@ > @@ -547,7 +547,7 @@ @@ -562,7 +562,7 @@ > @@ -570,7 +570,7 @@ @@ -640,21 +640,21 @@
diff --git a/account_financial_report/report/templates/open_items.xml b/account_financial_report/report/templates/open_items.xml index 65f6b2bf..7bb652fd 100644 --- a/account_financial_report/report/templates/open_items.xml +++ b/account_financial_report/report/templates/open_items.xml @@ -210,14 +210,14 @@
@@ -276,13 +276,13 @@ diff --git a/account_financial_report/report/templates/trial_balance.xml b/account_financial_report/report/templates/trial_balance.xml index b0f3077a..3369905f 100644 --- a/account_financial_report/report/templates/trial_balance.xml +++ b/account_financial_report/report/templates/trial_balance.xml @@ -300,7 +300,7 @@
@@ -314,7 +314,7 @@ @@ -330,7 +330,7 @@ @@ -350,7 +350,7 @@ @@ -366,7 +366,7 @@ @@ -384,7 +384,7 @@ @@ -404,7 +404,7 @@ @@ -420,7 +420,7 @@ @@ -438,7 +438,7 @@ @@ -458,7 +458,7 @@ @@ -473,7 +473,7 @@ @@ -491,7 +491,7 @@ @@ -509,7 +509,7 @@ @@ -522,7 +522,7 @@ @@ -538,7 +538,7 @@ @@ -716,7 +716,7 @@ - + @@ -731,7 +731,7 @@ - + @@ -746,7 +746,7 @@ - + @@ -761,7 +761,7 @@ - + @@ -773,7 +773,7 @@ - + @@ -832,35 +832,35 @@
diff --git a/account_financial_report/report/templates/vat_report.xml b/account_financial_report/report/templates/vat_report.xml index 3c85a88b..a0354980 100644 --- a/account_financial_report/report/templates/vat_report.xml +++ b/account_financial_report/report/templates/vat_report.xml @@ -72,14 +72,14 @@
@@ -114,7 +114,7 @@ @@ -133,7 +133,7 @@ diff --git a/account_financial_report/report/vat_report.py b/account_financial_report/report/vat_report.py index d1b89974..a7e5406b 100644 --- a/account_financial_report/report/vat_report.py +++ b/account_financial_report/report/vat_report.py @@ -229,6 +229,7 @@ class VATReport(models.AbstractModel): "doc_model": "open.items.report.wizard", "docs": self.env["open.items.report.wizard"].browse(wizard_id), "company_name": company.display_name, + "company_currency": company.currency_id, "currency_name": company.currency_id.name, "date_to": data["date_to"], "date_from": data["date_from"], diff --git a/account_financial_report/wizard/abstract_wizard.py b/account_financial_report/wizard/abstract_wizard.py index 6b784367..d182e2d9 100644 --- a/account_financial_report/wizard/abstract_wizard.py +++ b/account_financial_report/wizard/abstract_wizard.py @@ -33,6 +33,7 @@ class AbstractWizard(models.AbstractModel): default=lambda self: self.env.company.id, required=False, string="Company", + domain=lambda self: [("id", "in", self.env.companies.ids)], ) def button_export_html(self):