trytond-edocument-ubl 8.2.0__tar.gz → 8.2.1__tar.gz

{trytond_edocument_ubl-8.2.0 → trytond_edocument_ubl-8.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: trytond_edocument_ubl
-Version: 8.2.0
+Version: 8.2.1
 Summary: UBL electronic document for Tryton
 Project-URL: homepage, https://www.tryton.org/
 Project-URL: documentation, https://docs.tryton.org/modules-edocument-ubl/

{trytond_edocument_ubl-8.2.0 → trytond_edocument_ubl-8.2.1}/edocument.py

@@ -239,7 +239,7 @@ class Invoice(Model):
                     base += line.base
                     amount += line.amount
                 tax_lines.append(TaxLine(base=base, amount=amount, tax=tax))
-            yield group, tax_lines, amount
+            yield group, tax_lines, tax_amount
 
     def _taxes_key(self, line):
         return ()
@@ -413,21 +413,9 @@ class Invoice(Model):
                     is not None)):
             invoice.cash_rounding = True
 
-        if tax_exlusive_amount := root.findtext(
+        if tax_exclusive_amount := root.findtext(
                 './{*}LegalMonetaryTotal/{*}TaxExclusiveAmount'):
-            untaxed_amount = Decimal(tax_exlusive_amount)
-
-            if allowance_total_amount := root.findtext(
-                    './{*}LegalMonetaryTotal/{*}AllowanceTotalAmount'):
-                allowance_total_amount = Decimal(allowance_total_amount)
-                untaxed_amount -= allowance_total_amount
-
-            if charge_total_amount := root.findtext(
-                    './{*}LegalMonetaryTotal/{*}ChargeTotalAmount'):
-                charge_total_amount = Decimal(charge_total_amount)
-                untaxed_amount += charge_total_amount
-
-            invoice.source_untaxed_amount = untaxed_amount
+            invoice.source_untaxed_amount = Decimal(tax_exclusive_amount)
 
         tax_amount = sum(Decimal(amount.text) for amount in root.iterfind(
                 './{*}TaxTotal/{*}TaxAmount'))
@@ -738,21 +726,9 @@ class Invoice(Model):
                 is not None):
             invoice.cash_rounding = True
 
-        if tax_exlusive_amount := root.findtext(
+        if tax_exclusive_amount := root.findtext(
                 './{*}LegalMonetaryTotal/{*}TaxExclusiveAmount'):
-            untaxed_amount = Decimal(tax_exlusive_amount)
-
-            if allowance_total_amount := root.findtext(
-                    './{*}LegalMonetaryTotal/{*}AllowanceTotalAmount'):
-                allowance_total_amount = Decimal(allowance_total_amount)
-                untaxed_amount -= allowance_total_amount
-
-            if charge_total_amount := root.findtext(
-                    './{*}LegalMonetaryTotal/{*}ChargeTotalAmount'):
-                charge_total_amount = Decimal(charge_total_amount)
-                untaxed_amount += charge_total_amount
-
-            invoice.source_untaxed_amount = -untaxed_amount
+            invoice.source_untaxed_amount = -Decimal(tax_exclusive_amount)
 
         tax_amount = sum(Decimal(amount.text) for amount in root.iterfind(
                 './{*}TaxTotal/{*}TaxAmount'))

{trytond_edocument_ubl-8.2.0 → trytond_edocument_ubl-8.2.1}/template/2/CreditNote.xml

@@ -16,7 +16,9 @@ this repository contains the full copyright notices and license terms. -->
 </py:if>
 <cbc:ID>${this.invoice.number}</cbc:ID>
 <cbc:IssueDate>${this.invoice.invoice_date}</cbc:IssueDate>
-<cbc:DueDate>${max(l.maturity_date for l in this.invoice.lines_to_pay if l.maturity_date)}</cbc:DueDate>
+<py:if test="specification != 'peppol-bis-3'">
+    <cbc:DueDate>${max(l.maturity_date for l in this.invoice.lines_to_pay if l.maturity_date)}</cbc:DueDate>
+</py:if>
 <cbc:CreditNoteTypeCode>${this.type_code}</cbc:CreditNoteTypeCode>
 <cbc:DocumentCurrencyCode>${this.invoice.currency.code}</cbc:DocumentCurrencyCode>
 <cbc:BuyerReference py:if="this.invoice.reference">${this.invoice.reference}</cbc:BuyerReference>

{trytond_edocument_ubl-8.2.0 → trytond_edocument_ubl-8.2.1}/tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=8.2.0
+version=8.2.1
 depends:
     edocument_unece
     ir