From e19ddb38c062c94fba221e736b8485a5e168e632 Mon Sep 17 00:00:00 2001 From: Alfredo Zamora Date: Fri, 12 Mar 2021 15:29:47 +0100 Subject: [PATCH 01/94] ADD quater and quinquies reports for intrastat_mod1 and intrastat_mod2 --- l10n_it_intrastat_statement/__manifest__.py | 4 + l10n_it_intrastat_statement/i18n/it.po | 24 ++- .../intrastat_statement_purchase_section3.py | 10 ++ .../intrastat_statement_purchase_section4.py | 10 ++ .../intrastat_statement_sale_section3.py | 10 ++ .../intrastat_statement_sale_section4.py | 10 ++ .../report/report_intrastat_mod1_quater.xml | 120 +++++++++++++++ .../report_intrastat_mod1_quinquies.xml | 133 +++++++++++++++++ .../report/report_intrastat_mod2_quater.xml | 124 ++++++++++++++++ .../report_intrastat_mod2_quinquies.xml | 137 ++++++++++++++++++ .../report/reports.xml | 56 +++++++ 11 files changed, 636 insertions(+), 2 deletions(-) create mode 100644 l10n_it_intrastat_statement/report/report_intrastat_mod1_quater.xml create mode 100644 l10n_it_intrastat_statement/report/report_intrastat_mod1_quinquies.xml create mode 100644 l10n_it_intrastat_statement/report/report_intrastat_mod2_quater.xml create mode 100644 l10n_it_intrastat_statement/report/report_intrastat_mod2_quinquies.xml diff --git a/l10n_it_intrastat_statement/__manifest__.py b/l10n_it_intrastat_statement/__manifest__.py index 7d1afd109ee..6e0f499d67c 100644 --- a/l10n_it_intrastat_statement/__manifest__.py +++ b/l10n_it_intrastat_statement/__manifest__.py @@ -23,8 +23,12 @@ "report/report_intrastat_mod1.xml", "report/intrastat_mod1_bis.xml", "report/intrastat_mod1_ter.xml", + "report/report_intrastat_mod1_quater.xml", + "report/report_intrastat_mod1_quinquies.xml", "report/report_intrastat_mod2.xml", "report/report_intrastat_mod2_bis.xml", + "report/report_intrastat_mod2_quater.xml", + "report/report_intrastat_mod2_quinquies.xml", "report/reports.xml", ], } diff --git a/l10n_it_intrastat_statement/i18n/it.po b/l10n_it_intrastat_statement/i18n/it.po index c1eb98d2279..117e5b62139 100644 --- a/l10n_it_intrastat_statement/i18n/it.po +++ b/l10n_it_intrastat_statement/i18n/it.po @@ -1,10 +1,10 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * l10n_it_intrastat_statement +# * l10n_it_intrastat_statement # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0+e-20191007\n" +"Project-Id-Version: Odoo Server 12.0+e\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-12 11:04+0000\n" "PO-Revision-Date: 2023-10-13 10:39+0000\n" @@ -416,6 +416,16 @@ msgstr "Modello INTRA-1 bis" msgid "INTRA-1 Model" msgstr "Modello INTRA-1" +#. module: l10n_it_intrastat_statement +#: model:ir.actions.report,name:l10n_it_intrastat_statement.print_intrastat_mod1_quater +msgid "INTRA-1 Quater Model" +msgstr "Modello INTRA-1 quater" + +#. module: l10n_it_intrastat_statement +#: model:ir.actions.report,name:l10n_it_intrastat_statement.print_intrastat_mod1_quinquies +msgid "INTRA-1 Quinquies Model" +msgstr "Modello INTRA-1 quinquies" + #. module: l10n_it_intrastat_statement #: model:ir.actions.report,name:l10n_it_intrastat_statement.print_intrastat_mod1_ter msgid "INTRA-1 Ter Model" @@ -431,6 +441,16 @@ msgstr "Modello INTRA-2 bis" msgid "INTRA-2 Model" msgstr "Modello INTRA-2" +#. module: l10n_it_intrastat_statement +#: model:ir.actions.report,name:l10n_it_intrastat_statement.print_intrastat_mod2_quater +msgid "INTRA-2 Quater Model" +msgstr "Modello INTRA-2 quater" + +#. module: l10n_it_intrastat_statement +#: model:ir.actions.report,name:l10n_it_intrastat_statement.print_intrastat_mod2_quinquies +msgid "INTRA-2 Quinquies Model" +msgstr "Modello INTRA-2 quinquies" + #. module: l10n_it_intrastat_statement #: model_terms:ir.ui.view,arch_db:l10n_it_intrastat_statement.account_intrastat_statement_form_view msgid "INTRASTAT Statement" diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section3.py b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section3.py index f95e8a867f8..5784a9ff278 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section3.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section3.py @@ -21,6 +21,16 @@ class IntrastatStatementPurchaseSection3(models.Model): comodel_name="res.country", string="Payment Country" ) + @api.multi + def get_supply_method_key(self): + self.ensure_one() + return self.supply_method + + @api.multi + def get_payment_method_key(self): + self.ensure_one() + return self.payment_method + @api.model def get_section_number(self): return 3 diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section4.py b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section4.py index b4f3b7514a1..94de13deb54 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section4.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section4.py @@ -32,6 +32,16 @@ class IntrastatStatementPurchaseSection4(models.Model): comodel_name="res.country", string="Payment Country" ) + @api.multi + def get_supply_method_key(self): + self.ensure_one() + return self.supply_method + + @api.multi + def get_payment_method_key(self): + self.ensure_one() + return self.payment_method + @api.model def get_section_number(self): return 4 diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section3.py b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section3.py index d3bc5072ad1..9cf4b613906 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section3.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section3.py @@ -23,6 +23,16 @@ class IntrastatStatementSaleSection3(models.Model): comodel_name="res.country", string="Payment Country" ) + @api.multi + def get_supply_method_key(self): + self.ensure_one() + return self.supply_method + + @api.multi + def get_payment_method_key(self): + self.ensure_one() + return self.payment_method + @api.model def get_section_number(self): return 3 diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section4.py b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section4.py index cfd56e0062b..06f17fbdc15 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section4.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section4.py @@ -35,6 +35,16 @@ class IntrastatStatementSaleSection4(models.Model): help="The Adjustment is intended for cancellation", ) + @api.multi + def get_supply_method_key(self): + self.ensure_one() + return self.supply_method + + @api.multi + def get_payment_method_key(self): + self.ensure_one() + return self.payment_method + @api.model def get_section_number(self): return 4 diff --git a/l10n_it_intrastat_statement/report/report_intrastat_mod1_quater.xml b/l10n_it_intrastat_statement/report/report_intrastat_mod1_quater.xml new file mode 100644 index 00000000000..d60a2b48b6b --- /dev/null +++ b/l10n_it_intrastat_statement/report/report_intrastat_mod1_quater.xml @@ -0,0 +1,120 @@ + + + + diff --git a/l10n_it_intrastat_statement/report/report_intrastat_mod1_quinquies.xml b/l10n_it_intrastat_statement/report/report_intrastat_mod1_quinquies.xml new file mode 100644 index 00000000000..1a972b2791c --- /dev/null +++ b/l10n_it_intrastat_statement/report/report_intrastat_mod1_quinquies.xml @@ -0,0 +1,133 @@ + + + + diff --git a/l10n_it_intrastat_statement/report/report_intrastat_mod2_quater.xml b/l10n_it_intrastat_statement/report/report_intrastat_mod2_quater.xml new file mode 100644 index 00000000000..d55d250468e --- /dev/null +++ b/l10n_it_intrastat_statement/report/report_intrastat_mod2_quater.xml @@ -0,0 +1,124 @@ + + + + diff --git a/l10n_it_intrastat_statement/report/report_intrastat_mod2_quinquies.xml b/l10n_it_intrastat_statement/report/report_intrastat_mod2_quinquies.xml new file mode 100644 index 00000000000..5b2aa1bdf7f --- /dev/null +++ b/l10n_it_intrastat_statement/report/report_intrastat_mod2_quinquies.xml @@ -0,0 +1,137 @@ + + + + diff --git a/l10n_it_intrastat_statement/report/reports.xml b/l10n_it_intrastat_statement/report/reports.xml index e0cb59f8cd2..30506328644 100644 --- a/l10n_it_intrastat_statement/report/reports.xml +++ b/l10n_it_intrastat_statement/report/reports.xml @@ -109,4 +109,60 @@ ref="l10n_it_intrastat_statement.no_header_format_a4_landscape" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7bfa2eefa0541f926246d7420c59f26d6d36ef26 Mon Sep 17 00:00:00 2001 From: eLBati Date: Fri, 8 Mar 2024 15:00:17 +0100 Subject: [PATCH 02/94] Porting quater and quinquies reports to v16 --- l10n_it_intrastat_statement/i18n/it.po | 24 +- .../intrastat_statement_purchase_section3.py | 2 - .../intrastat_statement_purchase_section4.py | 2 - .../intrastat_statement_sale_section3.py | 2 - .../intrastat_statement_sale_section4.py | 2 - .../report/report_intrastat_mod1_quater.xml | 221 +++++++++------ .../report_intrastat_mod1_quinquies.xml | 256 ++++++++++------- .../report/report_intrastat_mod2_quater.xml | 230 +++++++++------ .../report_intrastat_mod2_quinquies.xml | 266 +++++++++++------- .../report/reports.xml | 28 +- 10 files changed, 622 insertions(+), 411 deletions(-) diff --git a/l10n_it_intrastat_statement/i18n/it.po b/l10n_it_intrastat_statement/i18n/it.po index 117e5b62139..c1eb98d2279 100644 --- a/l10n_it_intrastat_statement/i18n/it.po +++ b/l10n_it_intrastat_statement/i18n/it.po @@ -1,10 +1,10 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * l10n_it_intrastat_statement +# * l10n_it_intrastat_statement # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0+e\n" +"Project-Id-Version: Odoo Server 12.0+e-20191007\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-12 11:04+0000\n" "PO-Revision-Date: 2023-10-13 10:39+0000\n" @@ -416,16 +416,6 @@ msgstr "Modello INTRA-1 bis" msgid "INTRA-1 Model" msgstr "Modello INTRA-1" -#. module: l10n_it_intrastat_statement -#: model:ir.actions.report,name:l10n_it_intrastat_statement.print_intrastat_mod1_quater -msgid "INTRA-1 Quater Model" -msgstr "Modello INTRA-1 quater" - -#. module: l10n_it_intrastat_statement -#: model:ir.actions.report,name:l10n_it_intrastat_statement.print_intrastat_mod1_quinquies -msgid "INTRA-1 Quinquies Model" -msgstr "Modello INTRA-1 quinquies" - #. module: l10n_it_intrastat_statement #: model:ir.actions.report,name:l10n_it_intrastat_statement.print_intrastat_mod1_ter msgid "INTRA-1 Ter Model" @@ -441,16 +431,6 @@ msgstr "Modello INTRA-2 bis" msgid "INTRA-2 Model" msgstr "Modello INTRA-2" -#. module: l10n_it_intrastat_statement -#: model:ir.actions.report,name:l10n_it_intrastat_statement.print_intrastat_mod2_quater -msgid "INTRA-2 Quater Model" -msgstr "Modello INTRA-2 quater" - -#. module: l10n_it_intrastat_statement -#: model:ir.actions.report,name:l10n_it_intrastat_statement.print_intrastat_mod2_quinquies -msgid "INTRA-2 Quinquies Model" -msgstr "Modello INTRA-2 quinquies" - #. module: l10n_it_intrastat_statement #: model_terms:ir.ui.view,arch_db:l10n_it_intrastat_statement.account_intrastat_statement_form_view msgid "INTRASTAT Statement" diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section3.py b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section3.py index 5784a9ff278..12590d69d25 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section3.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section3.py @@ -21,12 +21,10 @@ class IntrastatStatementPurchaseSection3(models.Model): comodel_name="res.country", string="Payment Country" ) - @api.multi def get_supply_method_key(self): self.ensure_one() return self.supply_method - @api.multi def get_payment_method_key(self): self.ensure_one() return self.payment_method diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section4.py b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section4.py index 94de13deb54..a608f44177c 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section4.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section4.py @@ -32,12 +32,10 @@ class IntrastatStatementPurchaseSection4(models.Model): comodel_name="res.country", string="Payment Country" ) - @api.multi def get_supply_method_key(self): self.ensure_one() return self.supply_method - @api.multi def get_payment_method_key(self): self.ensure_one() return self.payment_method diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section3.py b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section3.py index 9cf4b613906..016d6aacbf2 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section3.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section3.py @@ -23,12 +23,10 @@ class IntrastatStatementSaleSection3(models.Model): comodel_name="res.country", string="Payment Country" ) - @api.multi def get_supply_method_key(self): self.ensure_one() return self.supply_method - @api.multi def get_payment_method_key(self): self.ensure_one() return self.payment_method diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section4.py b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section4.py index 06f17fbdc15..c0b147979a8 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section4.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section4.py @@ -35,12 +35,10 @@ class IntrastatStatementSaleSection4(models.Model): help="The Adjustment is intended for cancellation", ) - @api.multi def get_supply_method_key(self): self.ensure_one() return self.supply_method - @api.multi def get_payment_method_key(self): self.ensure_one() return self.payment_method diff --git a/l10n_it_intrastat_statement/report/report_intrastat_mod1_quater.xml b/l10n_it_intrastat_statement/report/report_intrastat_mod1_quater.xml index d60a2b48b6b..c0d6acfdf96 100644 --- a/l10n_it_intrastat_statement/report/report_intrastat_mod1_quater.xml +++ b/l10n_it_intrastat_statement/report/report_intrastat_mod1_quater.xml @@ -1,4 +1,4 @@ - +