From bc06c0afbc98d195e1fc65a2e037175796f6ef1e Mon Sep 17 00:00:00 2001 From: Borruso Date: Fri, 5 Jul 2024 15:33:42 +0200 Subject: [PATCH] [DEL] pos_glory_connector: eliminato cambio nome campo intrastat --- l10n_it_intrastat/demo/product_demo.xml | 2 +- l10n_it_intrastat/i18n/es.po | 8 ++--- l10n_it_intrastat/i18n/it.po | 8 ++--- l10n_it_intrastat/i18n/l10n_it_intrastat.pot | 8 ++--- l10n_it_intrastat/models/account.py | 20 ++++++------ l10n_it_intrastat/models/product.py | 14 ++++---- l10n_it_intrastat/views/account.xml | 12 +++---- l10n_it_intrastat/views/product.xml | 4 +-- l10n_it_intrastat_statement/README.rst | 2 +- l10n_it_intrastat_statement/__manifest__.py | 2 +- l10n_it_intrastat_statement/i18n/es.po | 30 ++++++++--------- l10n_it_intrastat_statement/i18n/it.po | 30 ++++++++--------- .../i18n/l10n_it_intrastat_statement.pot | 27 +++++++--------- .../models/intrastat_statement.py | 2 +- .../intrastat_statement_purchase_section1.py | 6 ++-- .../intrastat_statement_purchase_section2.py | 2 +- .../intrastat_statement_purchase_section3.py | 2 +- .../intrastat_statement_purchase_section4.py | 8 ++--- .../intrastat_statement_sale_section1.py | 6 ++-- .../intrastat_statement_sale_section2.py | 2 +- .../intrastat_statement_sale_section3.py | 2 +- .../intrastat_statement_sale_section4.py | 2 +- .../models/intrastat_statement_section.py | 4 +-- .../report/intrastat_mod1_bis.xml | 2 +- .../report/intrastat_mod1_ter.xml | 2 +- .../report/report_intrastat_mod2_bis.xml | 2 +- .../static/description/index.html | 2 +- .../tests/test_intrastat_statement.py | 2 +- .../views/intrastat.xml | 32 +++++++++---------- 29 files changed, 114 insertions(+), 131 deletions(-) diff --git a/l10n_it_intrastat/demo/product_demo.xml b/l10n_it_intrastat/demo/product_demo.xml index 2efdd7d01e0f..26b59b255abc 100644 --- a/l10n_it_intrastat/demo/product_demo.xml +++ b/l10n_it_intrastat/demo/product_demo.xml @@ -12,7 +12,7 @@ good - + diff --git a/l10n_it_intrastat/i18n/es.po b/l10n_it_intrastat/i18n/es.po index aafafd4d31df..6763f1c1e623 100644 --- a/l10n_it_intrastat/i18n/es.po +++ b/l10n_it_intrastat/i18n/es.po @@ -30086,8 +30086,8 @@ msgid "Intrastat" msgstr "" #. module: l10n_it_intrastat -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_product__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_template__l10n_it_intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_product__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_template__intrastat_code_id #: model:ir.model.fields,field_description:l10n_it_intrastat.field_report_intrastat_code__name #: model_terms:ir.ui.view,arch_db:l10n_it_intrastat.view_form_report_intrastat_code msgid "Intrastat Code" @@ -40328,8 +40328,8 @@ msgid "" msgstr "" #. module: l10n_it_intrastat -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_account_invoice_intrastat__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_category__l10n_it_intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_account_invoice_intrastat__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_category__intrastat_code_id #: model_terms:ir.ui.view,arch_db:l10n_it_intrastat.view_invoice_intrastat_search msgid "Nomenclature Code" msgstr "Código Nomenclatura" diff --git a/l10n_it_intrastat/i18n/it.po b/l10n_it_intrastat/i18n/it.po index e31a372566cb..9c78a25173ea 100644 --- a/l10n_it_intrastat/i18n/it.po +++ b/l10n_it_intrastat/i18n/it.po @@ -37965,8 +37965,8 @@ msgid "Intrastat" msgstr "Intrastat" #. module: l10n_it_intrastat -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_product__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_template__l10n_it_intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_product__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_template__intrastat_code_id #: model:ir.model.fields,field_description:l10n_it_intrastat.field_report_intrastat_code__name #: model_terms:ir.ui.view,arch_db:l10n_it_intrastat.view_form_report_intrastat_code msgid "Intrastat Code" @@ -51248,8 +51248,8 @@ msgid "" msgstr "Pettinacce di lana o di peli fini, non carbonizzate" #. module: l10n_it_intrastat -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_account_invoice_intrastat__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_category__l10n_it_intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_account_invoice_intrastat__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_category__intrastat_code_id #: model_terms:ir.ui.view,arch_db:l10n_it_intrastat.view_invoice_intrastat_search msgid "Nomenclature Code" msgstr "Codice nomenclatura" diff --git a/l10n_it_intrastat/i18n/l10n_it_intrastat.pot b/l10n_it_intrastat/i18n/l10n_it_intrastat.pot index 9e8b32cac3dc..a6c7fe77943b 100644 --- a/l10n_it_intrastat/i18n/l10n_it_intrastat.pot +++ b/l10n_it_intrastat/i18n/l10n_it_intrastat.pot @@ -30169,8 +30169,8 @@ msgid "Intrastat" msgstr "" #. module: l10n_it_intrastat -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_product__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_template__l10n_it_intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_product__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_template__intrastat_code_id #: model:ir.model.fields,field_description:l10n_it_intrastat.field_report_intrastat_code__name #: model_terms:ir.ui.view,arch_db:l10n_it_intrastat.view_form_report_intrastat_code msgid "Intrastat Code" @@ -40446,8 +40446,8 @@ msgid "" msgstr "" #. module: l10n_it_intrastat -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_account_invoice_intrastat__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_category__l10n_it_intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_account_invoice_intrastat__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat.field_product_category__intrastat_code_id #: model_terms:ir.ui.view,arch_db:l10n_it_intrastat.view_invoice_intrastat_search msgid "Nomenclature Code" msgstr "" diff --git a/l10n_it_intrastat/models/account.py b/l10n_it_intrastat/models/account.py index f64b89b5ec84..21389acfa392 100644 --- a/l10n_it_intrastat/models/account.py +++ b/l10n_it_intrastat/models/account.py @@ -241,13 +241,11 @@ def _prepare_intrastat_line_code(self, product_template, res): intrastat_data = product_template.get_intrastat_data() intrastat_code_model = self.env["report.intrastat.code"] intrastat_code = intrastat_code_model - if intrastat_data["l10n_it_intrastat_code_id"]: + if intrastat_data["intrastat_code_id"]: intrastat_code = intrastat_code_model.browse( - intrastat_data["l10n_it_intrastat_code_id"] + intrastat_data["intrastat_code_id"] ) - res.update( - {"l10n_it_intrastat_code_id": intrastat_data["l10n_it_intrastat_code_id"]} - ) + res.update({"intrastat_code_id": intrastat_data["intrastat_code_id"]}) return intrastat_code, intrastat_data def _prepare_intrastat_line_amount(self, res): @@ -407,7 +405,7 @@ def _get_intrastat_lines_to_split(self): product_template = line.product_id.product_tmpl_id intrastat_data = product_template.get_intrastat_data() if ( - "l10n_it_intrastat_code_id" not in intrastat_data + "intrastat_code_id" not in intrastat_data or intrastat_data["intrastat_type"] == "exclude" ): continue @@ -418,12 +416,12 @@ def _get_intrastat_lines_to_split(self): if intrastat_data["intrastat_type"] == "misc": lines_to_split.append(line) continue - if not intrastat_data["l10n_it_intrastat_code_id"]: + if not intrastat_data["intrastat_code_id"]: continue # Group by intrastat code intra_line = line._prepare_intrastat_line() - i_code_id = intra_line["l10n_it_intrastat_code_id"] + i_code_id = intra_line["intrastat_code_id"] i_code_type = intra_line["intrastat_code_type"] i_country_good_origin = intra_line["country_good_origin_id"] @@ -569,7 +567,7 @@ def _get_partner_data(self, partner): required=True, default="good", ) - l10n_it_intrastat_code_id = fields.Many2one( + intrastat_code_id = fields.Many2one( comodel_name="report.intrastat.code", string="Nomenclature Code", required=True ) statement_section = fields.Selection( @@ -607,7 +605,7 @@ def _get_partner_data(self, partner): additional_units_uom = fields.Char( string="Additional Unit of Measure", readonly=True, - related="l10n_it_intrastat_code_id.additional_unit_uom_id.name", + related="intrastat_code_id.additional_unit_uom_id.name", ) statistic_amount_euro = fields.Float( string="Statistic Value in Euro", digits="Account" @@ -677,7 +675,7 @@ def change_amount_euro(self): @api.onchange("intrastat_code_type") def change_intrastat_code_type(self): self.statement_section = self._compute_statement_section() - self.l10n_it_intrastat_code_id = False + self.intrastat_code_id = False class AccountPaymentTerm(models.Model): diff --git a/l10n_it_intrastat/models/product.py b/l10n_it_intrastat/models/product.py index 9b2f3a3f6e67..b10681e0cd4b 100644 --- a/l10n_it_intrastat/models/product.py +++ b/l10n_it_intrastat/models/product.py @@ -7,7 +7,7 @@ class ProductCategory(models.Model): _inherit = "product.category" - l10n_it_intrastat_code_id = fields.Many2one( + intrastat_code_id = fields.Many2one( "report.intrastat.code", string="Nomenclature Code" ) intrastat_country_origin_id = fields.Many2one( @@ -26,7 +26,7 @@ class ProductCategory(models.Model): class ProductTemplate(models.Model): _inherit = "product.template" - l10n_it_intrastat_code_id = fields.Many2one( + intrastat_code_id = fields.Many2one( comodel_name="report.intrastat.code", string="Intrastat Code" ) intrastat_country_origin_id = fields.Many2one( @@ -49,19 +49,17 @@ def get_intrastat_data(self): - Intrastat Code on product category """ res = { - "l10n_it_intrastat_code_id": False, + "intrastat_code_id": False, "intrastat_country_origin_id": False, "intrastat_type": False, } # From Product if self.intrastat_type: - res["l10n_it_intrastat_code_id"] = self.l10n_it_intrastat_code_id.id + res["intrastat_code_id"] = self.intrastat_code_id.id res["intrastat_country_origin_id"] = self.intrastat_country_origin_id.id res["intrastat_type"] = self.intrastat_type - elif self.categ_id and self.categ_id.l10n_it_intrastat_code_id: - res[ - "l10n_it_intrastat_code_id" - ] = self.categ_id.l10n_it_intrastat_code_id.id + elif self.categ_id and self.categ_id.intrastat_code_id: + res["intrastat_code_id"] = self.categ_id.intrastat_code_id.id res[ "intrastat_country_origin_id" ] = self.categ_id.intrastat_country_origin_id.id diff --git a/l10n_it_intrastat/views/account.xml b/l10n_it_intrastat/views/account.xml index b791545e02d2..2faa60f8e1b0 100644 --- a/l10n_it_intrastat/views/account.xml +++ b/l10n_it_intrastat/views/account.xml @@ -62,7 +62,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -190,8 +190,8 @@ diff --git a/l10n_it_intrastat/views/product.xml b/l10n_it_intrastat/views/product.xml index 73e6765f435a..3fb7312b339f 100644 --- a/l10n_it_intrastat/views/product.xml +++ b/l10n_it_intrastat/views/product.xml @@ -13,7 +13,7 @@ @@ -35,7 +35,7 @@ diff --git a/l10n_it_intrastat_statement/README.rst b/l10n_it_intrastat_statement/README.rst index 4ba79afd3d3b..57ce4b33c193 100644 --- a/l10n_it_intrastat_statement/README.rst +++ b/l10n_it_intrastat_statement/README.rst @@ -7,7 +7,7 @@ ITA - Dichiarazione Intrastat !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:f900acbf3f17aaa915e8c260680ec67754f71899aed4db599d7e758c005e3069 + !! source digest: sha256:76c29c7aa911dfa926cfcdee4552e40232a2e0c6d006db4a63e1bd345308a66f !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/l10n_it_intrastat_statement/__manifest__.py b/l10n_it_intrastat_statement/__manifest__.py index 25bd91a78174..7d1afd109eec 100644 --- a/l10n_it_intrastat_statement/__manifest__.py +++ b/l10n_it_intrastat_statement/__manifest__.py @@ -3,7 +3,7 @@ { "name": "ITA - Dichiarazione Intrastat", - "version": "16.0.1.0.1", + "version": "16.0.1.0.2", "category": "Account", "summary": "Dichiarazione Intrastat per l'Agenzia delle Dogane", "author": "Openforce, Link IT srl, Agile Business Group, " diff --git a/l10n_it_intrastat_statement/i18n/es.po b/l10n_it_intrastat_statement/i18n/es.po index d4ab7bfde876..b58449ff7c69 100644 --- a/l10n_it_intrastat_statement/i18n/es.po +++ b/l10n_it_intrastat_statement/i18n/es.po @@ -442,17 +442,17 @@ msgid "Instant" msgstr "Instantánea" #. module: l10n_it_intrastat_statement -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section1__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section2__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section3__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section1__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section2__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section3__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section4__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_section__l10n_it_intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section1__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section2__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section3__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section1__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section2__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section3__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section4__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_section__intrastat_code_id msgid "Intrastat Code" msgstr "Código Intrastat" @@ -970,11 +970,6 @@ msgstr "Progr." msgid "Progressive to Adjust" msgstr "Progresivo para ajustar" -#. module: l10n_it_intrastat_statement -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__progressive_to_modify_id -msgid "Progressive to Adjust ID" -msgstr "Progresivo para ajustar ID" - #. module: l10n_it_intrastat_statement #: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__protocol #: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section4__protocol @@ -1350,6 +1345,9 @@ msgstr "Año" msgid "or" msgstr "ó" +#~ msgid "Progressive to Adjust ID" +#~ msgstr "Progresivo para ajustar ID" + #, python-format #~ msgid "Missing vat code for %s on '%s - Section %s'" #~ msgstr "Falta el código de IVA para %s en '%s - Sección %s'" diff --git a/l10n_it_intrastat_statement/i18n/it.po b/l10n_it_intrastat_statement/i18n/it.po index 4681c03a7eea..c1eb98d22792 100644 --- a/l10n_it_intrastat_statement/i18n/it.po +++ b/l10n_it_intrastat_statement/i18n/it.po @@ -445,17 +445,17 @@ msgid "Instant" msgstr "Istantanea" #. module: l10n_it_intrastat_statement -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section1__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section2__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section3__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section1__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section2__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section3__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section4__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_section__l10n_it_intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section1__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section2__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section3__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section1__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section2__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section3__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section4__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_section__intrastat_code_id msgid "Intrastat Code" msgstr "Codice Intrastat" @@ -979,11 +979,6 @@ msgstr "Progr." msgid "Progressive to Adjust" msgstr "Progressivo da rettificare" -#. module: l10n_it_intrastat_statement -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__progressive_to_modify_id -msgid "Progressive to Adjust ID" -msgstr "ID progressivo da rettificare" - #. module: l10n_it_intrastat_statement #: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__protocol #: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section4__protocol @@ -1359,6 +1354,9 @@ msgstr "Anno" msgid "or" msgstr "oppure" +#~ msgid "Progressive to Adjust ID" +#~ msgstr "ID progressivo da rettificare" + #, python-format #~ msgid "Missing vat code for %s on '%s - Section %s'" #~ msgstr "Codice IVA mancante per %s in \"%s - Sezione %s\"" diff --git a/l10n_it_intrastat_statement/i18n/l10n_it_intrastat_statement.pot b/l10n_it_intrastat_statement/i18n/l10n_it_intrastat_statement.pot index 16729e899a83..e931103b1ad1 100644 --- a/l10n_it_intrastat_statement/i18n/l10n_it_intrastat_statement.pot +++ b/l10n_it_intrastat_statement/i18n/l10n_it_intrastat_statement.pot @@ -438,17 +438,17 @@ msgid "Instant" msgstr "" #. module: l10n_it_intrastat_statement -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section1__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section2__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section3__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section1__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section2__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section3__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section4__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section__l10n_it_intrastat_code_id -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_section__l10n_it_intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section1__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section2__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section3__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section1__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section2__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section3__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section4__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section__intrastat_code_id +#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_section__intrastat_code_id msgid "Intrastat Code" msgstr "" @@ -964,11 +964,6 @@ msgstr "" msgid "Progressive to Adjust" msgstr "" -#. module: l10n_it_intrastat_statement -#: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__progressive_to_modify_id -msgid "Progressive to Adjust ID" -msgstr "" - #. module: l10n_it_intrastat_statement #: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_purchase_section4__protocol #: model:ir.model.fields,field_description:l10n_it_intrastat_statement.field_account_intrastat_statement_sale_section4__protocol diff --git a/l10n_it_intrastat_statement/models/intrastat_statement.py b/l10n_it_intrastat_statement/models/intrastat_statement.py index ce4206a508d7..4186ee6762ce 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement.py @@ -845,7 +845,7 @@ def refund_line(self, line, to_ref_obj): domain = [ ("statement_id", "=", self.id), ("partner_id", "=", line.partner_id.id), - ("l10n_it_intrastat_code_id", "=", line.l10n_it_intrastat_code_id.id), + ("intrastat_code_id", "=", line.intrastat_code_id.id), ("amount_euro", ">=", line.amount_euro), ] line_to_refund = to_ref_obj.search(domain, limit=1) diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section1.py b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section1.py index 23e9a5386865..3e8956534439 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section1.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section1.py @@ -26,12 +26,12 @@ class IntrastatStatementPurchaseSection1(models.Model): additional_units_required = fields.Boolean( string="Additional Unit Required", store=True, - related="l10n_it_intrastat_code_id.additional_unit_required", + related="intrastat_code_id.additional_unit_required", ) additional_units_uom = fields.Char( string="Additional Unit of Measure", readonly=True, - related="l10n_it_intrastat_code_id.additional_unit_uom_id.name", + related="intrastat_code_id.additional_unit_uom_id.name", ) statistic_amount_euro = fields.Integer(string="Statistic Value in Euro") delivery_code_id = fields.Many2one( @@ -150,7 +150,7 @@ def _prepare_export_line(self): # Codice della natura della transazione rcd += format_x(self.transaction_nature_id.code, 1) # Codice della nomenclatura combinata della merce - rcd += format_9(self.l10n_it_intrastat_code_id.name, 8) + rcd += format_9(self.intrastat_code_id.name, 8) if self.statement_id.period_type == "M": #  Massa netta in chilogrammi rcd += format_9(self.weight_kg, 10) diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section2.py b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section2.py index 0ae94d972640..ee1a88718cb9 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section2.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section2.py @@ -131,7 +131,7 @@ def _prepare_export_line(self): # Codice della natura della transazione rcd += format_x(self.transaction_nature_id.code, 1) # Codice della nomenclatura combinata della merce - rcd += format_9(self.l10n_it_intrastat_code_id.name, 8) + rcd += format_9(self.intrastat_code_id.name, 8) if self.statement_id.period_type == "M": #  Valore statistico in euro rcd += format_9(self.statistic_amount_euro, 13) 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 73e8b30e305c..f95e8a867f82 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section3.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section3.py @@ -66,7 +66,7 @@ def _prepare_export_line(self): invoice_date_ddmmyy = self.invoice_date.strftime("%d%m%y") rcd += format_x(invoice_date_ddmmyy, 6) # Codice del servizio - rcd += format_9(self.l10n_it_intrastat_code_id.name, 6) + rcd += format_9(self.intrastat_code_id.name, 6) # Modalità di erogazione rcd += format_x(self.supply_method, 1) # Modalità di incasso 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 90453e77e2f1..b4f3b7514a11 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section4.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_purchase_section4.py @@ -19,10 +19,6 @@ class IntrastatStatementPurchaseSection4(models.Model): quarterly = fields.Integer(string="Ref. Quarter") year_id = fields.Integer(string="Ref. Year") protocol = fields.Integer(string="Protocol Number") - progressive_to_modify_id = fields.Many2one( - comodel_name="account.intrastat.statement.purchase.section1", - string="Progressive to Adjust ID", - ) progressive_to_modify = fields.Integer(string="Progressive to Adjust") invoice_number = fields.Char() invoice_date = fields.Date() @@ -98,7 +94,7 @@ def _prepare_export_line(self): # Protocollo della dichiarazione da rettificare rcd += format_9(self.protocol, 6) # Progressivo della sezione 3 da rettificare - rcd += format_9(self.progressive_to_modify_id.sequence, 5) + rcd += format_9(self.progressive_to_modify, 5) # Codice dello Stato membro dell’acquirente country_id = self.country_partner_id or self.partner_id.country_id rcd += format_x(country_id.code, 2) @@ -122,7 +118,7 @@ def _prepare_export_line(self): invoice_date_ddmmyy = self.invoice_date.strftime("%d%m%y") rcd += format_x(invoice_date_ddmmyy, 6) # Codice del servizio - rcd += format_9(self.l10n_it_intrastat_code_id.name, 6) + rcd += format_9(self.intrastat_code_id.name, 6) # Modalità di erogazione rcd += format_x(self.supply_method, 1) # Modalità di incasso diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section1.py b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section1.py index 8daba1b09272..9a764d09cb59 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section1.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section1.py @@ -21,12 +21,12 @@ class IntrastatStatementSaleSection1(models.Model): additional_units_required = fields.Boolean( string="Additional Unit Required", store=True, - related="l10n_it_intrastat_code_id.additional_unit_required", + related="intrastat_code_id.additional_unit_required", ) additional_units_uom = fields.Char( string="Additional Unit of Measure", readonly=True, - related="l10n_it_intrastat_code_id.additional_unit_uom_id.name", + related="intrastat_code_id.additional_unit_uom_id.name", ) statistic_amount_euro = fields.Integer(string="Statistic Value in Euro") delivery_code_id = fields.Many2one( @@ -155,7 +155,7 @@ def _prepare_export_line(self): rcd += format_x(self.transaction_nature_id.code, 1) # Codice della nomenclatura combinata della merce - rcd += format_9(self.l10n_it_intrastat_code_id.name, 8) + rcd += format_9(self.intrastat_code_id.name, 8) if self.statement_id.period_type == "M": #  Massa netta in chilogrammi rcd += format_9(self.weight_kg, 10) diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section2.py b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section2.py index fc4c203288d2..8dd953247f17 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section2.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section2.py @@ -111,7 +111,7 @@ def _prepare_export_line(self): # Codice della natura della transazione rcd += format_x(self.transaction_nature_id.code, 1) # Codice della nomenclatura combinata della merce - rcd += format_9(self.l10n_it_intrastat_code_id.name, 8) + rcd += format_9(self.intrastat_code_id.name, 8) if self.statement_id.period_type == "M": #  Valore statistico in euro rcd += format_9(self.statistic_amount_euro, 13) 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 5dff8d7d9f4f..d3bc5072ad12 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section3.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section3.py @@ -62,7 +62,7 @@ def _prepare_export_line(self): invoice_date_ddmmyy = self.invoice_date.strftime("%d%m%y") rcd += format_x(invoice_date_ddmmyy, 6) # Codice del servizio - rcd += format_9(self.l10n_it_intrastat_code_id.name, 6) + rcd += format_9(self.intrastat_code_id.name, 6) # Modalità di erogazione rcd += format_x(self.supply_method, 1) # Modalità di incasso 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 3de45eb3c417..cfd56e0062b7 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_sale_section4.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_sale_section4.py @@ -108,7 +108,7 @@ def _prepare_export_line(self): invoice_date_ddmmyy = self.invoice_date.strftime("%d%m%y") rcd += format_x(modifying and invoice_date_ddmmyy, 6) # Codice del servizio - rcd += format_9(modifying and self.l10n_it_intrastat_code_id.name, 6) + rcd += format_9(modifying and self.intrastat_code_id.name, 6) # Modalità di erogazione rcd += format_x(modifying and self.supply_method, 1) # Modalità di incasso diff --git a/l10n_it_intrastat_statement/models/intrastat_statement_section.py b/l10n_it_intrastat_statement/models/intrastat_statement_section.py index 23a8bb6ae7af..66fea39621a8 100644 --- a/l10n_it_intrastat_statement/models/intrastat_statement_section.py +++ b/l10n_it_intrastat_statement/models/intrastat_statement_section.py @@ -25,7 +25,7 @@ class IntrastatStatementSection(models.AbstractModel): invoice_id = fields.Many2one( comodel_name="account.move", string="Invoice", readonly=True ) - l10n_it_intrastat_code_id = fields.Many2one(comodel_name="report.intrastat.code") + intrastat_code_id = fields.Many2one(comodel_name="report.intrastat.code") def apply_partner_data(self, partner_data): self.ensure_one() @@ -59,7 +59,7 @@ def _prepare_statement_line(self, inv_intra_line, statement_id=None): "country_partner_id": inv_intra_line.country_partner_id.id, "vat_code": partner_id.vat and partner_id.vat[2:], "amount_euro": amount_euro, - "l10n_it_intrastat_code_id": inv_intra_line.l10n_it_intrastat_code_id.id, + "intrastat_code_id": inv_intra_line.intrastat_code_id.id, } def _export_line_checks(self, section_label, section_number): diff --git a/l10n_it_intrastat_statement/report/intrastat_mod1_bis.xml b/l10n_it_intrastat_statement/report/intrastat_mod1_bis.xml index 191897851b65..fb34b2e5bcc1 100644 --- a/l10n_it_intrastat_statement/report/intrastat_mod1_bis.xml +++ b/l10n_it_intrastat_statement/report/intrastat_mod1_bis.xml @@ -148,7 +148,7 @@ t-field="l.transaction_nature_b_id.code" /> - + ITA - Dichiarazione Intrastat !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:f900acbf3f17aaa915e8c260680ec67754f71899aed4db599d7e758c005e3069 +!! source digest: sha256:76c29c7aa911dfa926cfcdee4552e40232a2e0c6d006db4a63e1bd345308a66f !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/l10n-italy Translate me on Weblate Try me on Runboat

Italiano

diff --git a/l10n_it_intrastat_statement/tests/test_intrastat_statement.py b/l10n_it_intrastat_statement/tests/test_intrastat_statement.py index 2a0d87c4a59d..da405a307284 100644 --- a/l10n_it_intrastat_statement/tests/test_intrastat_statement.py +++ b/l10n_it_intrastat_statement/tests/test_intrastat_statement.py @@ -61,7 +61,7 @@ def setUp(self): self.service01.update( { "intrastat_type": "service", - "l10n_it_intrastat_code_id": self.env.ref( + "intrastat_code_id": self.env.ref( "l10n_it_intrastat.intrastat_intrastat_01012100" ), } diff --git a/l10n_it_intrastat_statement/views/intrastat.xml b/l10n_it_intrastat_statement/views/intrastat.xml index b4123d11bc55..90ffed9ac7c2 100644 --- a/l10n_it_intrastat_statement/views/intrastat.xml +++ b/l10n_it_intrastat_statement/views/intrastat.xml @@ -286,7 +286,7 @@ - + @@ -323,7 +323,7 @@ @@ -362,7 +362,7 @@ - + @@ -395,7 +395,7 @@ @@ -424,7 +424,7 @@ - + @@ -457,7 +457,7 @@ @@ -487,7 +487,7 @@ - + @@ -530,7 +530,7 @@ - + @@ -598,7 +598,7 @@ @@ -639,7 +639,7 @@ - + @@ -672,7 +672,7 @@ @@ -702,7 +702,7 @@ - + @@ -726,7 +726,7 @@ - + @@ -754,7 +754,7 @@ - + @@ -791,7 +791,7 @@