Skip to content

Commit d427304

Browse files
committed
[UPD] l10n_it_edi_extension: aggiornata PR OCA#4411
1 parent 9c5ba2f commit d427304

14 files changed

+109
-102
lines changed

l10n_it_edi_extension/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"data/invoice_it_template.xml",
2121
"views/l10n_it_view.xml",
2222
"views/res_partner_view.xml",
23-
"wizards/edi_import_file_wizard.xml",
23+
"wizards/l10n_it_edi_import_file_wizard.xml",
2424
],
2525
"installable": True,
2626
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from . import res_partner
2-
from . import fatturapa_article_code
3-
from . import discount_rise_price
4-
from . import einvoice_line_other_data
5-
from . import fatturapa_activity_progress
6-
from . import fatturapa_summary_data
7-
from . import einvoice_line
2+
from . import l10n_it_edi_article_code
3+
from . import l10n_it_edi_discount_rise_price
4+
from . import l10n_it_edi_line_other_data
5+
from . import l10n_it_edi_activity_progress
6+
from . import l10n_it_edi_summary_data
7+
from . import l10n_it_edi_line
88
from . import account_move
99
from . import ir_attachment

l10n_it_edi_extension/models/account_move.py

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,21 @@ class AccountMoveInherit(models.Model):
5757
string="Preview link",
5858
compute="_compute_l10n_it_edi_attachment_preview_link",
5959
)
60-
e_invoice_line_ids = fields.One2many(
61-
"einvoice.line",
60+
l10n_it_edi_line_ids = fields.One2many(
61+
"l10n_it_edi.line",
6262
"invoice_id",
6363
string="E-Invoice Lines",
6464
readonly=True,
6565
copy=False,
6666
)
67-
fatturapa_summary_ids = fields.One2many(
68-
"fatturapa.summary.data",
67+
l10n_it_edi_summary_ids = fields.One2many(
68+
"l10n_it_edi.summary_data",
6969
"invoice_id",
7070
string="E-Invoice Summary Data",
7171
copy=False,
7272
)
73-
activity_progress_ids = fields.One2many(
74-
"fatturapa.activity.progress",
73+
l10n_it_edi_activity_progress_ids = fields.One2many(
74+
"l10n_it_edi.activity_progress",
7575
"invoice_id",
7676
string="E-Invoice Activity Progress",
7777
copy=False,
@@ -82,7 +82,7 @@ class AccountMoveInherit(models.Model):
8282
help="Possible total amount rounding on the document (negative sign allowed)",
8383
copy=False,
8484
)
85-
l10n_it_art73 = fields.Boolean(
85+
l10n_edi_it_art73 = fields.Boolean(
8686
string="Art. 73",
8787
readonly=True,
8888
help="Indicates whether the document has been issued according to "
@@ -92,37 +92,37 @@ class AccountMoveInherit(models.Model):
9292
"documents with same number)",
9393
copy=False,
9494
)
95-
l10n_it_related_invoice_code = fields.Char(
95+
l10n_it_edi_related_invoice_code = fields.Char(
9696
string="Related Invoice Code", copy=False
9797
)
98-
l10n_it_related_invoice_date = fields.Date(
98+
l10n_it_edi_related_invoice_date = fields.Date(
9999
string="Related Invoice Date", copy=False
100100
)
101-
l10n_it_stabile_organizzazione_indirizzo = fields.Char(
101+
l10n_it_edi_stabile_organizzazione_indirizzo = fields.Char(
102102
string="Organization Address",
103103
help="The fields must be entered only when the seller/provider is "
104104
"non-resident, with a stable organization in Italy. Address of "
105105
"the stable organization in Italy (street name, square, etc.)",
106106
readonly=True,
107107
copy=False,
108108
)
109-
l10n_it_stabile_organizzazione_civico = fields.Char(
109+
l10n_it_edi_stabile_organizzazione_civico = fields.Char(
110110
string="Organization Street Number",
111111
help="Street number of the address (no need to specify if already "
112112
"present in the address field)",
113113
readonly=True,
114114
copy=False,
115115
)
116-
l10n_it_stabile_organizzazione_cap = fields.Char(
116+
l10n_it_edi_stabile_organizzazione_cap = fields.Char(
117117
string="Organization ZIP", help="ZIP Code", readonly=True, copy=False
118118
)
119-
l10n_it_stabile_organizzazione_comune = fields.Char(
119+
l10n_it_edi_stabile_organizzazione_comune = fields.Char(
120120
string="Organization Municipality",
121121
help="Municipality or city to which the Stable Organization refers",
122122
readonly=True,
123123
copy=False,
124124
)
125-
l10n_it_stabile_organizzazione_provincia = fields.Char(
125+
l10n_it_edi_stabile_organizzazione_provincia = fields.Char(
126126
string="Organization Province",
127127
help="Acronym of the Province to which the municipality indicated "
128128
"in the information element 1.2.3.4 <Comune> belongs. "
@@ -131,7 +131,7 @@ class AccountMoveInherit(models.Model):
131131
readonly=True,
132132
copy=False,
133133
)
134-
l10n_it_stabile_organizzazione_nazione = fields.Char(
134+
l10n_it_edi_stabile_organizzazione_nazione = fields.Char(
135135
string="Organization Country",
136136
help="Country code according to the ISO 3166-1 alpha-2 code standard",
137137
readonly=True,
@@ -268,13 +268,13 @@ def _l10n_it_edi_get_extra_info(
268268
self.l10n_it_edi_rounding = rounding
269269

270270
if get_text(body_tree, "//DatiGeneraliDocumento/Art73"):
271-
self.l10n_it_art73 = True
271+
self.l10n_edi_it_art73 = True
272272

273273
if elements_sal := body_tree.xpath(".//DatiGenerali/DatiSAL"):
274274
for element_sal in elements_sal:
275-
self.env["fatturapa.activity.progress"].create(
275+
self.env["l10n_it_edi.activity_progress"].create(
276276
{
277-
"fatturapa_activity_progress": get_text(
277+
"activity_progress": get_text(
278278
element_sal, ".//RiferimentoFase"
279279
),
280280
"invoice_id": self.id,
@@ -287,10 +287,10 @@ def _l10n_it_edi_get_extra_info(
287287
for element_parent_invoice in elements_parent_invoice:
288288
self.write(
289289
{
290-
"l10n_it_related_invoice_code": get_text(
290+
"l10n_it_edi_related_invoice_code": get_text(
291291
element_parent_invoice, ".//NumeroFatturaPrincipale"
292292
),
293-
"l10n_it_related_invoice_date": get_date(
293+
"l10n_it_edi_related_invoice_date": get_date(
294294
element_parent_invoice, ".//DataFatturaPrincipale"
295295
),
296296
}
@@ -309,7 +309,7 @@ def _l10n_it_edi_get_extra_info(
309309

310310
if elements_summary := body_tree.xpath(".//DatiBeniServizi/DatiRiepilogo"):
311311
for element_summary in elements_summary:
312-
self.env["fatturapa.summary.data"].create(
312+
self.env["l10n_it_edi.summary_data"].create(
313313
{
314314
"tax_rate": get_float(element_summary, ".//AliquotaIVA"),
315315
"non_taxable_nature": get_text(element_summary, ".//Natura"),
@@ -470,22 +470,22 @@ def _l10n_it_edi_search_partner(self, company, vat, codice_fiscale, email):
470470
for element_stabile_organizzazione in elements_stabile_organizzazione:
471471
self.write(
472472
{
473-
"l10n_it_stabile_organizzazione_indirizzo": get_text(
473+
"l10n_it_edi_stabile_organizzazione_indirizzo": get_text(
474474
element_stabile_organizzazione, ".//Indirizzo"
475475
),
476-
"l10n_it_stabile_organizzazione_civico": get_date(
476+
"l10n_it_edi_stabile_organizzazione_civico": get_date(
477477
element_stabile_organizzazione, ".//NumeroCivico"
478478
),
479-
"l10n_it_stabile_organizzazione_cap": get_date(
479+
"l10n_it_edi_stabile_organizzazione_cap": get_date(
480480
element_stabile_organizzazione, ".//CAP"
481481
),
482-
"l10n_it_stabile_organizzazione_comune": get_date(
482+
"l10n_it_edi_stabile_organizzazione_comune": get_date(
483483
element_stabile_organizzazione, ".//Comune"
484484
),
485-
"l10n_it_stabile_organizzazione_provincia": get_date(
485+
"l10n_it_edi_stabile_organizzazione_provincia": get_date(
486486
element_stabile_organizzazione, ".//Provincia"
487487
),
488-
"l10n_it_stabile_organizzazione_nazione": get_date(
488+
"l10n_it_edi_stabile_organizzazione_nazione": get_date(
489489
element_stabile_organizzazione, ".//Nazione"
490490
),
491491
}
@@ -511,40 +511,40 @@ def _l10n_it_edi_import_line(self, element, move_line, extra_info=None):
511511
"invoice_line_id": move_line.id,
512512
"invoice_id": move_line.move_id.id,
513513
}
514-
einvoice_line = self.env["einvoice.line"].create(vals)
514+
einvoice_line = self.env["l10n_it_edi.line"].create(vals)
515515

516516
if elements_code := element.xpath(".//CodiceArticolo"):
517517
for element_code in elements_code:
518-
self.env["fatturapa.article.code"].create(
518+
self.env["l10n_it_edi.article_code"].create(
519519
{
520520
"name": get_text(element_code, ".//CodiceTipo"),
521521
"code_val": get_text(element_code, ".//CodiceValore"),
522-
"e_invoice_line_id": einvoice_line.id,
522+
"l10n_it_edi_line_id": einvoice_line.id,
523523
}
524524
)
525525

526526
if elements_discount := element.xpath(".//ScontoMaggiorazione"):
527527
for element_discount in elements_discount:
528-
self.env["discount.rise.price"].create(
528+
self.env["l10n_it_edi.discount_rise_price"].create(
529529
{
530530
"name": get_text(element_discount, ".//Tipo"),
531531
"percentage": get_float(element_discount, ".//Percentuale"),
532532
"amount": get_float(element_discount, ".//Importo"),
533-
"e_invoice_line_id": einvoice_line.id,
533+
"l10n_it_edi_line_id": einvoice_line.id,
534534
}
535535
)
536536

537537
if elements_other_data := element.xpath(".//AltriDatiGestionali"):
538538
for element_other_data in elements_other_data:
539-
self.env["einvoice.line.other.data"].create(
539+
self.env["l10n_it_edi.line_other_data"].create(
540540
{
541541
"name": get_text(element_other_data, ".//TipoDato"),
542542
"text_ref": get_text(element_other_data, ".//RiferimentoTesto"),
543543
"num_ref": get_float(
544544
element_other_data, ".//RiferimentoNumero"
545545
),
546546
"date_ref": get_date(element_other_data, ".//RiferimentoData"),
547-
"e_invoice_line_id": einvoice_line.id,
547+
"l10n_it_edi_line_id": einvoice_line.id,
548548
}
549549
)
550550

l10n_it_edi_extension/models/fatturapa_activity_progress.py renamed to l10n_it_edi_extension/models/l10n_it_edi_activity_progress.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
from odoo import fields, models
55

66

7-
class FatturapaActivityProgress(models.Model):
8-
_name = "fatturapa.activity.progress"
7+
class EInvoiceActivityProgress(models.Model):
8+
_name = "l10n_it_edi.activity_progress"
99
_description = "E-invoice activity progress"
1010

11-
fatturapa_activity_progress = fields.Integer(string="Activity Progress")
11+
activity_progress = fields.Integer()
1212
invoice_id = fields.Many2one(
1313
"account.move", string="Related Invoice", ondelete="cascade", index=True
1414
)

l10n_it_edi_extension/models/fatturapa_article_code.py renamed to l10n_it_edi_extension/models/l10n_it_edi_article_code.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
from odoo import fields, models
55

66

7-
class FatturapaArticleCode(models.Model):
8-
_name = "fatturapa.article.code"
7+
class EInvoiceArticleCode(models.Model):
8+
_name = "l10n_it_edi.article_code"
99
_description = "E-invoice Article Code"
1010

1111
name = fields.Char(string="Code Type")
1212
code_val = fields.Char(string="Code Value")
13-
e_invoice_line_id = fields.Many2one(
14-
"einvoice.line", string="Related E-invoice Line", readonly=True
13+
l10n_it_edi_line_id = fields.Many2one(
14+
"l10n_it_edi.line", string="Related E-invoice Line", readonly=True
1515
)

l10n_it_edi_extension/models/discount_rise_price.py renamed to l10n_it_edi_extension/models/l10n_it_edi_discount_rise_price.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from odoo import fields, models
55

66

7-
class DiscountRisePrice(models.Model):
8-
_name = "discount.rise.price"
7+
class EInvoiceDiscountRisePrice(models.Model):
8+
_name = "l10n_it_edi.discount_rise_price"
99
_description = "E-invoice Discount Supplement Data"
1010

1111
name = fields.Selection([("SC", "Discount"), ("MG", "Supplement")], string="Type")
@@ -20,6 +20,6 @@ class DiscountRisePrice(models.Model):
2020
invoice_id = fields.Many2one(
2121
"account.move", string="Related Invoice", ondelete="cascade", index=True
2222
)
23-
e_invoice_line_id = fields.Many2one(
24-
"einvoice.line", string="Related E-invoice Line", readonly=True
23+
l10n_it_edi_line_id = fields.Many2one(
24+
"l10n_it_edi.line", string="Related E-invoice Line", readonly=True
2525
)

l10n_it_edi_extension/models/einvoice_line.py renamed to l10n_it_edi_extension/models/l10n_it_edi_line.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66

77
class EInvoiceLine(models.Model):
8-
_name = "einvoice.line"
9-
_description = "E-invoice line"
8+
_name = "l10n_it_edi.line"
9+
_description = "E-invoice Line"
1010

1111
invoice_id = fields.Many2one(
1212
"account.move", string="Invoice", readonly=True, ondelete="cascade"
@@ -16,9 +16,9 @@ class EInvoiceLine(models.Model):
1616
)
1717
line_number = fields.Integer(readonly=True)
1818
service_type = fields.Char(string="Sale Provision Type", readonly=True)
19-
cod_article_ids = fields.One2many(
20-
"fatturapa.article.code",
21-
"e_invoice_line_id",
19+
l10n_it_edi_article_code_ids = fields.One2many(
20+
"l10n_it_edi.article_code",
21+
"l10n_it_edi_line_id",
2222
string="Articles Code",
2323
readonly=True,
2424
)
@@ -30,9 +30,9 @@ class EInvoiceLine(models.Model):
3030
period_start_date = fields.Date(readonly=True)
3131
period_end_date = fields.Date(readonly=True)
3232
unit_price = fields.Float(readonly=True, digits="Product Price")
33-
discount_rise_price_ids = fields.One2many(
34-
"discount.rise.price",
35-
"e_invoice_line_id",
33+
l10n_it_edi_discount_rise_price_ids = fields.One2many(
34+
"l10n_it_edi.discount_rise_price",
35+
"l10n_it_edi_line_id",
3636
string="Discount and Supplement Details",
3737
readonly=True,
3838
)
@@ -41,9 +41,9 @@ class EInvoiceLine(models.Model):
4141
wt_amount = fields.Char(string="Tax Withholding", readonly=True)
4242
tax_kind = fields.Char(string="Nature", readonly=True)
4343
admin_ref = fields.Char(string="Administration Reference", readonly=True)
44-
other_data_ids = fields.One2many(
45-
"einvoice.line.other.data",
46-
"e_invoice_line_id",
44+
l10n_it_edi_line_other_data_ids = fields.One2many(
45+
"l10n_it_edi.line_other_data",
46+
"l10n_it_edi_line_id",
4747
string="Other Administrative Data",
4848
readonly=True,
4949
)

l10n_it_edi_extension/models/einvoice_line_other_data.py renamed to l10n_it_edi_extension/models/l10n_it_edi_line_other_data.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66

77
class EInvoiceLineOtherData(models.Model):
8-
_name = "einvoice.line.other.data"
8+
_name = "l10n_it_edi.line_other_data"
99
_description = "E-invoice line other data"
1010

11-
e_invoice_line_id = fields.Many2one(
12-
"einvoice.line", string="Related E-bill Line", readonly=True
11+
l10n_it_edi_line_id = fields.Many2one(
12+
"l10n_it_edi.line", string="Related E-bill Line", readonly=True
1313
)
1414
name = fields.Char(string="Data Type", readonly=True)
1515
text_ref = fields.Char(string="Text Reference", readonly=True)

l10n_it_edi_extension/models/fatturapa_summary_data.py renamed to l10n_it_edi_extension/models/l10n_it_edi_summary_data.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from odoo import fields, models
55

66

7-
class FatturapaSummaryData(models.Model):
8-
_name = "fatturapa.summary.data"
7+
class EInvoiceSummaryData(models.Model):
8+
_name = "l10n_it_edi.summary_data"
99
_description = "E-invoice summary data"
1010

1111
tax_rate = fields.Float()
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
2-
access_fatturapa_article_code,access_fatturapa_article_code,l10n_it_edi_extension.model_fatturapa_article_code,account.group_account_invoice,1,1,1,1
3-
access_discount_rise_price,access_discount_rise_price,l10n_it_edi_extension.model_discount_rise_price,account.group_account_invoice,1,1,1,1
4-
access_einvoice_line_other_data,access_einvoice_line_other_data,l10n_it_edi_extension.model_einvoice_line_other_data,account.group_account_invoice,1,1,1,1
5-
access_fatturapa_activity_progress,access_fatturapa_activity_progress,l10n_it_edi_extension.model_fatturapa_activity_progress,account.group_account_invoice,1,1,1,1
6-
access_fatturapa_summary_data,access_fatturapa_summary_data,l10n_it_edi_extension.model_fatturapa_summary_data,account.group_account_invoice,1,1,1,1
7-
access_einvoice_line,access_einvoice_line,l10n_it_edi_extension.model_einvoice_line,account.group_account_invoice,1,1,1,1
8-
access_edi_import_file_wizard,access_edi_import_file_wizard,l10n_it_edi_extension.model_edi_import_file_wizard,account.group_account_invoice,1,1,1,1
2+
access_l10n_it_edi_article_code,access_l10n_it_edi_article_code,l10n_it_edi_extension.model_l10n_it_edi_article_code,account.group_account_invoice,1,1,1,1
3+
access_l10n_it_edi_discount_rise_price,access_l10n_it_edi_discount_rise_price,l10n_it_edi_extension.model_l10n_it_edi_discount_rise_price,account.group_account_invoice,1,1,1,1
4+
access_l10n_it_edi_line_other_data,access_l10n_it_edi_line_other_data,l10n_it_edi_extension.model_l10n_it_edi_line_other_data,account.group_account_invoice,1,1,1,1
5+
access_l10n_it_edi_activity_progress,access_l10n_it_edi_activity_progress,l10n_it_edi_extension.model_l10n_it_edi_activity_progress,account.group_account_invoice,1,1,1,1
6+
access_l10n_it_edi_summary_data,access_l10n_it_edi_summary_data,l10n_it_edi_extension.model_l10n_it_edi_summary_data,account.group_account_invoice,1,1,1,1
7+
access_l10n_it_edi_line,access_l10n_it_edi_line,l10n_it_edi_extension.model_l10n_it_edi_line,account.group_account_invoice,1,1,1,1
8+
access_l10n_it_edi_import_file_wizard,access_l10n_it_edi_import_file_wizard,l10n_it_edi_extension.model_l10n_it_edi_import_file_wizard,account.group_account_invoice,1,1,1,1

0 commit comments

Comments
 (0)