Skip to content

Commit

Permalink
[DEL] pos_glory_connector: eliminato cambio nome campo intrastat
Browse files Browse the repository at this point in the history
  • Loading branch information
Borruso committed Jul 5, 2024
1 parent eb3917a commit bc06c0a
Show file tree
Hide file tree
Showing 29 changed files with 114 additions and 131 deletions.
2 changes: 1 addition & 1 deletion l10n_it_intrastat/demo/product_demo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!-- Intrastat on product -->
<record id="product.product_product_10_product_template" model="product.template">
<field name="intrastat_type">good</field>
<field name="l10n_it_intrastat_code_id" ref="intrastat_intrastat_01012100" />
<field name="intrastat_code_id" ref="intrastat_intrastat_01012100" />
</record>

<record id="tax_22" model="account.tax">
Expand Down
8 changes: 4 additions & 4 deletions l10n_it_intrastat/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions l10n_it_intrastat/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions l10n_it_intrastat/i18n/l10n_it_intrastat.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 ""
Expand Down
20 changes: 9 additions & 11 deletions l10n_it_intrastat/models/account.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand All @@ -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"]

Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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):
Expand Down
14 changes: 6 additions & 8 deletions l10n_it_intrastat/models/product.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions l10n_it_intrastat/views/account.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<field name="arch" type="xml">
<tree>
<field name="intrastat_code_type" />
<field name="l10n_it_intrastat_code_id" />
<field name="intrastat_code_id" />
<field name="transaction_nature_id" />
<field name="transaction_nature_b_id" />
<field name="transport_code_id" />
Expand All @@ -81,7 +81,7 @@
<group>
<group>
<field name="intrastat_code_type" />
<field name="l10n_it_intrastat_code_id" />
<field name="intrastat_code_id" />
<field name="amount_currency" />
<field name="amount_euro" />
<field name="statistic_amount_euro" />
Expand Down Expand Up @@ -171,7 +171,7 @@
<tree create="false">
<field name="partner_id" />
<field name="invoice_id" />
<field name="l10n_it_intrastat_code_id" />
<field name="intrastat_code_id" />
<field name="country_origin_id" />
<field name="country_destination_id" />
<field name="transaction_nature_id" />
Expand All @@ -190,8 +190,8 @@
<field name="arch" type="xml">
<search string="Intrastat Search">
<field
name="l10n_it_intrastat_code_id"
filter_domain="[('l10n_it_intrastat_code_id','ilike',self)]"
name="intrastat_code_id"
filter_domain="[('intrastat_code_id','ilike',self)]"
/>
<field
name="partner_id"
Expand All @@ -216,7 +216,7 @@
name="intrastat_code"
string="Nomenclature Code"
domain="[]"
context="{'group_by':'l10n_it_intrastat_code_id'}"
context="{'group_by':'intrastat_code_id'}"
/>
</group>
</search>
Expand Down
4 changes: 2 additions & 2 deletions l10n_it_intrastat/views/product.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</group>
<group>
<field
name="l10n_it_intrastat_code_id"
name="intrastat_code_id"
attrs="{'invisible':[('intrastat_type','!=', 'good'),('intrastat_type','!=', 'service')],
'required':[('intrastat_type','in', ['good', 'service'])]}"
/>
Expand All @@ -35,7 +35,7 @@
<group string="Intrastat" name="intrastat">
<field name="intrastat_type" />
<field
name="l10n_it_intrastat_code_id"
name="intrastat_code_id"
attrs="{'invisible':[('intrastat_type','!=', 'good'),('intrastat_type','!=', 'service')],
'required':[('intrastat_type','in', ['good', 'service'])]}"
/>
Expand Down
2 changes: 1 addition & 1 deletion l10n_it_intrastat_statement/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion l10n_it_intrastat_statement/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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, "
Expand Down
30 changes: 14 additions & 16 deletions l10n_it_intrastat_statement/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'"
Expand Down
Loading

0 comments on commit bc06c0a

Please sign in to comment.