Skip to content

Commit

Permalink
[REF] intrastat: refactoring cambio nome campo intrastat_code_id -> l…
Browse files Browse the repository at this point in the history
…10n_it_intrastat_code_id
  • Loading branch information
Borruso committed Jun 20, 2024
1 parent fe094ae commit eb3917a
Show file tree
Hide file tree
Showing 26 changed files with 104 additions and 104 deletions.
22 changes: 11 additions & 11 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__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
#: 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
msgid "Intrastat Code"
msgstr "Código Intrastat"

Expand Down
22 changes: 11 additions & 11 deletions l10n_it_intrastat_statement/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -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__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
#: 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
msgid "Intrastat Code"
msgstr "Codice Intrastat"

Expand Down
22 changes: 11 additions & 11 deletions l10n_it_intrastat_statement/i18n/l10n_it_intrastat_statement.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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__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
#: 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
msgid "Intrastat Code"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion l10n_it_intrastat_statement/models/intrastat_statement.py
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ def refund_line(self, line, to_ref_obj):
domain = [
("statement_id", "=", self.id),
("partner_id", "=", line.partner_id.id),
("intrastat_code_id", "=", line.intrastat_code_id.id),
("l10n_it_intrastat_code_id", "=", line.l10n_it_intrastat_code_id.id),
("amount_euro", ">=", line.amount_euro),
]
line_to_refund = to_ref_obj.search(domain, limit=1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ class IntrastatStatementPurchaseSection1(models.Model):
additional_units_required = fields.Boolean(
string="Additional Unit Required",
store=True,
related="intrastat_code_id.additional_unit_required",
related="l10n_it_intrastat_code_id.additional_unit_required",
)
additional_units_uom = fields.Char(
string="Additional Unit of Measure",
readonly=True,
related="intrastat_code_id.additional_unit_uom_id.name",
related="l10n_it_intrastat_code_id.additional_unit_uom_id.name",
)
statistic_amount_euro = fields.Integer(string="Statistic Value in Euro")
delivery_code_id = fields.Many2one(
Expand Down Expand Up @@ -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.intrastat_code_id.name, 8)
rcd += format_9(self.l10n_it_intrastat_code_id.name, 8)
if self.statement_id.period_type == "M":
#  Massa netta in chilogrammi
rcd += format_9(self.weight_kg, 10)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.intrastat_code_id.name, 8)
rcd += format_9(self.l10n_it_intrastat_code_id.name, 8)
if self.statement_id.period_type == "M":
#  Valore statistico in euro
rcd += format_9(self.statistic_amount_euro, 13)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.intrastat_code_id.name, 6)
rcd += format_9(self.l10n_it_intrastat_code_id.name, 6)
# Modalità di erogazione
rcd += format_x(self.supply_method, 1)
# Modalità di incasso
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,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.intrastat_code_id.name, 6)
rcd += format_9(self.l10n_it_intrastat_code_id.name, 6)
# Modalità di erogazione
rcd += format_x(self.supply_method, 1)
# Modalità di incasso
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ class IntrastatStatementSaleSection1(models.Model):
additional_units_required = fields.Boolean(
string="Additional Unit Required",
store=True,
related="intrastat_code_id.additional_unit_required",
related="l10n_it_intrastat_code_id.additional_unit_required",
)
additional_units_uom = fields.Char(
string="Additional Unit of Measure",
readonly=True,
related="intrastat_code_id.additional_unit_uom_id.name",
related="l10n_it_intrastat_code_id.additional_unit_uom_id.name",
)
statistic_amount_euro = fields.Integer(string="Statistic Value in Euro")
delivery_code_id = fields.Many2one(
Expand Down Expand Up @@ -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.intrastat_code_id.name, 8)
rcd += format_9(self.l10n_it_intrastat_code_id.name, 8)
if self.statement_id.period_type == "M":
#  Massa netta in chilogrammi
rcd += format_9(self.weight_kg, 10)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.intrastat_code_id.name, 8)
rcd += format_9(self.l10n_it_intrastat_code_id.name, 8)
if self.statement_id.period_type == "M":
#  Valore statistico in euro
rcd += format_9(self.statistic_amount_euro, 13)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.intrastat_code_id.name, 6)
rcd += format_9(self.l10n_it_intrastat_code_id.name, 6)
# Modalità di erogazione
rcd += format_x(self.supply_method, 1)
# Modalità di incasso
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.intrastat_code_id.name, 6)
rcd += format_9(modifying and self.l10n_it_intrastat_code_id.name, 6)
# Modalità di erogazione
rcd += format_x(modifying and self.supply_method, 1)
# Modalità di incasso
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class IntrastatStatementSection(models.AbstractModel):
invoice_id = fields.Many2one(
comodel_name="account.move", string="Invoice", readonly=True
)
intrastat_code_id = fields.Many2one(comodel_name="report.intrastat.code")
l10n_it_intrastat_code_id = fields.Many2one(comodel_name="report.intrastat.code")

def apply_partner_data(self, partner_data):
self.ensure_one()
Expand Down Expand Up @@ -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,
"intrastat_code_id": inv_intra_line.intrastat_code_id.id,
"l10n_it_intrastat_code_id": inv_intra_line.l10n_it_intrastat_code_id.id,
}

def _export_line_checks(self, section_label, section_number):
Expand Down
2 changes: 1 addition & 1 deletion l10n_it_intrastat_statement/report/intrastat_mod1_bis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
t-field="l.transaction_nature_b_id.code"
/></td>
<td><span
t-field="l.intrastat_code_id.name"
t-field="l.l10n_it_intrastat_code_id.name"
/></td>
<td><span t-field="l.weight_kg" /></td>
<td><span
Expand Down
2 changes: 1 addition & 1 deletion l10n_it_intrastat_statement/report/intrastat_mod1_ter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<td
t-esc="l.transaction_nature_id.code"
/>
<td t-esc="l.intrastat_code_id.name" />
<td t-esc="l.l10n_it_intrastat_code_id.name" />
<td t-esc="l.statistic_amount_euro" />
<t
t-set="total"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
t-field="l.transaction_nature_b_id.code"
/></td>
<td><span
t-field="l.intrastat_code_id.name"
t-field="l.l10n_it_intrastat_code_id.name"
/></td>
<td><span t-field="l.weight_kg" /></td>
<td><span
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def setUp(self):
self.service01.update(
{
"intrastat_type": "service",
"intrastat_code_id": self.env.ref(
"l10n_it_intrastat_code_id": self.env.ref(
"l10n_it_intrastat.intrastat_intrastat_01012100"
),
}
Expand Down
Loading

0 comments on commit eb3917a

Please sign in to comment.