Skip to content

Commit dbad815

Browse files
OCA-git-botGSLabIt
OCA-git-bot
authored and
GSLabIt
committed
l10n_it_fatturapa_out_triple_discount 12.0.2.0.1
1 parent 5cf5ef3 commit dbad815

13 files changed

Lines changed: 111 additions & 84 deletions

File tree

‎l10n_it_fatturapa_out/data/invoice_it_template.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ e 'line' per riga di fattura (a seconda del livello in cui sono chiamati)
119119
</template>
120120

121121
<template id="account_invoice_line_it_sconto_maggiorazione">
122-
<t t-set="importo" t-value="get_importo(line)" />
122+
<t t-set="importo" t-value="get_importo(line.price_unit, line.discount)" />
123123
<ScontoMaggiorazione t-if="line.discount != 0 or importo != 0">
124124
<!-- [2.2.1.10] -->
125125
<t t-if="importo">

‎l10n_it_fatturapa_out/wizard/efattura.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@ def get_all_taxes(record):
174174
wiz = self.env["wizard.export.fatturapa"]
175175
return wiz.getAllTaxes(record)
176176

177-
def get_importo(line):
178-
str_number = str(line.discount)
177+
def get_importo(price_unit, discount):
178+
str_number = str(discount)
179179
number = str_number[::-1].find(".")
180180
if number <= 2:
181181
return False
182-
return line.price_unit * line.discount / 100
182+
return price_unit * discount / 100
183183

184184
def get_importo_totale(invoice):
185185
# wrapper to a method in wizard (for better overriding)

‎l10n_it_fatturapa_out_triple_discount/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
2-
from . import wizards

‎l10n_it_fatturapa_out_triple_discount/__manifest__.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
33

44
{
5-
'name': 'ITA - Fattura elettronica - Integrazione sconto triplo',
6-
"summary": "Modulo ponte tra emissione "
7-
"fatture elettroniche e sconto triplo",
8-
"version": "12.0.2.0.0",
5+
"name": "ITA - Fattura elettronica - Integrazione sconto triplo",
6+
"summary": "Modulo ponte tra emissione " "fatture elettroniche e sconto triplo",
7+
"version": "14.0.1.0.0",
98
"development_status": "Beta",
109
"category": "Hidden",
11-
'website': 'https://github.com/OCA/l10n-italy/tree/12.0/'
12-
'l10n_it_fatturapa_out_triple_discount',
10+
"website": "https://github.com/OCA/l10n-italy"
11+
"l10n_it_fatturapa_out_triple_discount",
1312
"author": "Agile Business Group, Odoo Community Association (OCA)",
1413
"license": "AGPL-3",
1514
"auto_install": True,
1615
"depends": [
1716
"l10n_it_fatturapa_out",
1817
"account_invoice_triple_discount",
19-
]
18+
],
19+
"data": ["data/invoice_it_template.xml"],
2020
}

‎l10n_it_fatturapa_out_triple_discount/data/invoice_it_template.xml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo>
3+
<data>
4+
<template
5+
id="account_invoice_line_it_triple_discount"
6+
inherit_id="l10n_it_fatturapa_out.account_invoice_line_it_sconto_maggiorazione"
7+
>
8+
<xpath expr="//ScontoMaggiorazione" position="after">
9+
<t
10+
t-set="importo2"
11+
t-value="get_importo(line.price_unit, line.discount2)"
12+
/>
13+
<t
14+
t-set="importo3"
15+
t-value="get_importo(line.price_unit, line.discount3)"
16+
/>
17+
<ScontoMaggiorazione t-if="line.discount2 != 0 or importo2 != 0">
18+
<!-- [2.2.1.10] -->
19+
<t t-if="importo">
20+
<Tipo t-if="importo2 &gt; 0">SC</Tipo>
21+
<Tipo t-if="importo2 &lt;= 0">MG</Tipo>
22+
<Importo t-esc="format_numbers(abs(importo2))" />
23+
</t>
24+
<t t-else="">
25+
<Tipo t-if="line.discount2 &gt; 0">SC</Tipo>
26+
<Tipo t-if="line.discount2 &lt;= 0">MG</Tipo>
27+
<Percentuale t-esc="format_numbers_two(abs(line.discount2))" />
28+
</t>
29+
</ScontoMaggiorazione>
30+
<ScontoMaggiorazione t-if="line.discount3 != 0 or importo3 != 0">
31+
<!-- [2.2.1.10] -->
32+
<t t-if="importo">
33+
<Tipo t-if="importo3 &gt; 0">SC</Tipo>
34+
<Tipo t-if="importo3 &lt;= 0">MG</Tipo>
35+
<Importo t-esc="format_numbers(abs(importo3))" />
36+
</t>
37+
<t t-else="">
38+
<Tipo t-if="line.discount3 &gt; 0">SC</Tipo>
39+
<Tipo t-if="line.discount3 &lt;= 0">MG</Tipo>
40+
<Percentuale t-esc="format_numbers_two(abs(line.discount3))" />
41+
</t>
42+
</ScontoMaggiorazione>
43+
</xpath>
44+
</template>
45+
</data>
46+
</odoo>

‎l10n_it_fatturapa_out_triple_discount/readme/CONTRIBUTORS.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
* Simone Rubino
22
* Alex Comba <alex.comba@agilebg.com>
3+
* Giovanni Serra <giovanni@gslab.it>

‎l10n_it_fatturapa_out_triple_discount/tests/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
# tests disabled because unstable
55
# TODO https://github.com/OCA/l10n-italy/issues/1588
6-
#from . import test_fatturapa_triple_discount
6+
# from . import test_fatturapa_triple_discount

‎l10n_it_fatturapa_out_triple_discount/tests/data/IT06363391001_00001.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8" ?>
22
<ns1:FatturaElettronica
3-
xmlns:ns1="http://ivaservizi.agenziaentrate.gov.it/docs/xsd/fatture/v1.2"
4-
versione="FPA12">
3+
xmlns:ns1="http://ivaservizi.agenziaentrate.gov.it/docs/xsd/fatture/v1.2"
4+
versione="FPA12"
5+
>
56
<FatturaElettronicaHeader>
67
<DatiTrasmissione>
78
<IdTrasmittente>

‎l10n_it_fatturapa_out_triple_discount/tests/test_fatturapa_triple_discount.py‎

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,57 @@
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
33

44
import codecs
5-
from odoo.addons.l10n_it_fatturapa_out.tests.fatturapa_common import (
6-
FatturaPACommon)
75

6+
from odoo.addons.l10n_it_fatturapa_out.tests.fatturapa_common import FatturaPACommon
87

9-
class TestInvoiceTripleDiscount(FatturaPACommon):
108

9+
class TestInvoiceTripleDiscount(FatturaPACommon):
1110
def setUp(self):
1211
super(TestInvoiceTripleDiscount, self).setUp()
1312

1413
def test_xml_export_triple_discount(self):
15-
self.set_sequences(13, '2016-01-07')
16-
invoice = self.invoice_model.create({
17-
'date_invoice': '2016-01-07',
18-
'partner_id': self.res_partner_fatturapa_0.id,
19-
'journal_id': self.sales_journal.id,
20-
'account_id': self.a_recv.id,
21-
'payment_term_id': self.account_payment_term.id,
22-
'user_id': self.user_demo.id,
23-
'type': 'out_invoice',
24-
'currency_id': self.EUR.id,
25-
'invoice_line_ids': [
26-
(0, 0, {
27-
'account_id': self.a_sale.id,
28-
'product_id': self.product_product_10.id,
29-
'name': 'Mouse\nOptical',
30-
'quantity': 1,
31-
'uom_id': self.product_uom_unit.id,
32-
'price_unit': 10,
33-
'discount': 50,
34-
'discount2': 50,
35-
'discount3': 50,
36-
'invoice_line_tax_ids': [(6, 0, {
37-
self.tax_22.id})]
38-
})],
39-
})
14+
self.set_sequences(13, "2016-01-07")
15+
invoice = self.invoice_model.create(
16+
{
17+
"date_invoice": "2016-01-07",
18+
"partner_id": self.res_partner_fatturapa_0.id,
19+
"journal_id": self.sales_journal.id,
20+
"account_id": self.a_recv.id,
21+
"payment_term_id": self.account_payment_term.id,
22+
"user_id": self.user_demo.id,
23+
"type": "out_invoice",
24+
"currency_id": self.EUR.id,
25+
"invoice_line_ids": [
26+
(
27+
0,
28+
0,
29+
{
30+
"account_id": self.a_sale.id,
31+
"product_id": self.product_product_10.id,
32+
"name": "Mouse\nOptical",
33+
"quantity": 1,
34+
"uom_id": self.product_uom_unit.id,
35+
"price_unit": 10,
36+
"discount": 50,
37+
"discount2": 50,
38+
"discount3": 50,
39+
"invoice_line_tax_ids": [(6, 0, {self.tax_22.id})],
40+
},
41+
)
42+
],
43+
}
44+
)
4045
invoice.action_invoice_open()
4146
res = self.run_wizard(invoice.id)
4247

4348
self.assertTrue(res)
44-
attachment = self.attach_model.browse(res['res_id'])
45-
self.set_e_invoice_file_id(attachment, 'IT06363391001_00001.xml')
49+
attachment = self.attach_model.browse(res["res_id"])
50+
self.set_e_invoice_file_id(attachment, "IT06363391001_00001.xml")
4651

4752
# XML doc to be validated
48-
xml_content = codecs.decode(attachment.datas, 'base64')
49-
self.check_content(xml_content, 'IT06363391001_00001.xml',
50-
module_name='l10n_it_fatturapa_out_triple_discount')
53+
xml_content = codecs.decode(attachment.datas, "base64")
54+
self.check_content(
55+
xml_content,
56+
"IT06363391001_00001.xml",
57+
module_name="l10n_it_fatturapa_out_triple_discount",
58+
)

‎l10n_it_fatturapa_out_triple_discount/wizards/__init__.py‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)
⚡