trytond-edocument-ubl 8.0.2__tar.gz → 8.0.4__tar.gz

{trytond_edocument_ubl-8.0.2 → trytond_edocument_ubl-8.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: trytond_edocument_ubl
-Version: 8.0.2
+Version: 8.0.4
 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.0.2 → trytond_edocument_ubl-8.0.4}/edocument.py

@@ -279,7 +279,7 @@ class Invoice(Model):
             elif self.invoice.currency == self.invoice.company.currency:
                 return line.debit - line.credit
             else:
-                return 0
+                return Decimal(0)
         return sum(map(balance, self.invoice.lines_to_pay))
 
     @classmethod
@@ -382,6 +382,9 @@ class Invoice(Model):
             root.findall('./{*}PaymentMeans'), payees=payees)
         invoice.payment_term_date = cls._parse_2_payment_term_date(
             root.findall('./{*}PaymentTerms'))
+        if not invoice.payment_term_date:
+            if due_date := root.findtext('./{*}DueDate'):
+                invoice.payment_term_date = dt.date.fromisoformat(due_date)
         lines = [
             cls._parse_invoice_2_line(
                 line,
@@ -460,7 +463,9 @@ class Invoice(Model):
         if (invoiced_quantity := invoice_line.find('./{*}InvoicedQuantity')
                 ) is not None:
             line.quantity = float(invoiced_quantity.text)
-            digits = -Decimal(invoiced_quantity.text).as_tuple().exponent
+            digits = (
+                -Decimal(invoiced_quantity.text)
+                .normalize().as_tuple().exponent)
             if (unit_code := invoiced_quantity.get('unitCode')) not in {
                     None, 'ZZ', 'XZZ'}:
                 try:
@@ -695,6 +700,9 @@ class Invoice(Model):
             root.findall('./{*}PaymentMeans'), payees=payees)
         invoice.payment_term_date = cls._parse_2_payment_term_date(
             root.findall('./{*}PaymentTerms'))
+        if not invoice.payment_term_date:
+            if due_date := root.findtext('./{*}DueDate'):
+                invoice.payment_term_date = dt.date.fromisoformat(due_date)
         lines = [
             cls._parse_credit_note_2_line(
                 line, company=invoice.company, currency=invoice.currency,
@@ -771,7 +779,9 @@ class Invoice(Model):
         if (credited_quantity := credit_note_line.find('./{*}CreditedQuantity')
                 ) is not None:
             line.quantity = -float(credited_quantity.text)
-            digits = -Decimal(credited_quantity.text).as_tuple().exponent
+            digits = (
+                -Decimal(credited_quantity.text)
+                .normalize().as_tuple().exponent)
             if (unit_code := credited_quantity.get('unitCode')) not in {
                     None, 'ZZ', 'XZZ'}:
                 try:
@@ -1188,8 +1198,7 @@ class Invoice(Model):
     def _parse_2_payment_term_date(cls, payment_terms):
         dates = []
         for payment_term in payment_terms:
-            if (date := payment_term.findtext('./{*}PaymentDueDate')
-                    ) is not None:
+            if date := payment_term.findtext('./{*}PaymentDueDate'):
                 dates.append(dt.date.fromisoformat(date))
         return min(dates, default=None)
 
@@ -1314,13 +1323,16 @@ class Invoice(Model):
                         ) is not None:
                     mime_code = (
                         data.get('mimeCode') or 'application/octet-stream')
-                    name += mimetypes.guess_extension(mime_code) or ''
+                    if extension := mimetypes.guess_extension(mime_code):
+                        if not name.lower().endswith(extension):
+                            name += extension
                     attachment.type = 'data'
                     data = b64decode(data.text)
                     attachment.data = data
                 elif data := document.findtext(
                         './{*}Attachment/{*}EmbeddedDocument'):
-                    name += '.txt'
+                    if not name.lower().endswith('.txt'):
+                        name += '.txt'
                     attachment.type = 'data'
                     attachment.data = data
                 elif url := document.findtext(

{trytond_edocument_ubl-8.0.2 → trytond_edocument_ubl-8.0.4}/template/2/CreditNote.xml

@@ -90,7 +90,7 @@ this repository contains the full copyright notices and license terms. -->
     <py:otherwise>
         <cac:PaymentTerms py:for="line in this.invoice.lines_to_pay">
             <cbc:Note py:if="this.invoice.payment_term and this.invoice.payment_term.description">${this.invoice.payment_term.description}</cbc:Note>
-            <cbc:Amount py:attrs="{'currencyID': this.invoice.currency.code}">${line.amount}</cbc:Amount>
+            <cbc:Amount py:attrs="{'currencyID': this.invoice.currency.code}">${format(line.amount.normalize(), 'f')}</cbc:Amount>
             <cbc:PaymentDueDate>${line.maturity_date}</cbc:PaymentDueDate>
         </cac:PaymentTerms>
     </py:otherwise>
@@ -101,16 +101,16 @@ this repository contains the full copyright notices and license terms. -->
         <cbc:AllowanceChargeReasonCode py:if="reason_code">${reason_code}</cbc:AllowanceChargeReasonCode>
     </py:with>
     <cbc:AllowanceChargeReason>${allowance_charge.product.name}</cbc:AllowanceChargeReason>
-    <cbc:Amount py:attrs="{'currencyID': this.invoice.currency.code}">${abs(allowance_charge.amount)}</cbc:Amount>
+    <cbc:Amount py:attrs="{'currencyID': this.invoice.currency.code}">${format(abs(allowance_charge.amount).normalize(), 'f')}</cbc:Amount>
     <cac:TaxCategory py:for="tax_line in allowance_charge.invoice_taxes">
         ${TaxCategory(tax_line.tax)}
     </cac:TaxCategory>
 </cac:AllowanceCharge>
 <cac:TaxTotal py:for="group, lines, amount in this.taxes">
-    <cbc:TaxAmount py:attrs="{'currencyID': this.invoice.currency.code}">${-amount}</cbc:TaxAmount>
+    <cbc:TaxAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((-amount).normalize(), 'f')}</cbc:TaxAmount>
     <cac:TaxSubtotal py:for="line in lines">
-        <cbc:TaxableAmount py:attrs="{'currencyID': this.invoice.currency.code}">${-line.base}</cbc:TaxableAmount>
-        <cbc:TaxAmount py:attrs="{'currencyID': this.invoice.currency.code}">${-line.amount}</cbc:TaxAmount>
+        <cbc:TaxableAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((-line.base).normalize(), 'f')}</cbc:TaxableAmount>
+        <cbc:TaxAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((-line.amount).normalize(), 'f')}</cbc:TaxAmount>
         <cbc:Percent py:if="line.tax.type == 'percentage' and not (specification or '').startswith('peppol')">${format((line.tax.rate * 100).normalize(), 'f')}</cbc:Percent>
         <cac:TaxCategory>
             ${TaxCategory(line.tax)}
@@ -118,19 +118,19 @@ this repository contains the full copyright notices and license terms. -->
     </cac:TaxSubtotal>
 </cac:TaxTotal>
 <cac:LegalMonetaryTotal>
-    <cbc:LineExtensionAmount py:attrs="{'currencyID': this.invoice.currency.code}">${-this.invoice.untaxed_amount}</cbc:LineExtensionAmount>
-    <cbc:TaxExclusiveAmount py:attrs="{'currencyID': this.invoice.currency.code}">${-this.invoice.untaxed_amount}</cbc:TaxExclusiveAmount>
-    <cbc:TaxInclusiveAmount py:attrs="{'currencyID': this.invoice.currency.code}">${-(this.invoice.untaxed_amount + this.invoice.tax_amount)}</cbc:TaxInclusiveAmount>
+    <cbc:LineExtensionAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((-this.invoice.untaxed_amount).normalize(), 'f')}</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((-this.invoice.untaxed_amount).normalize(), 'f')}</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((-(this.invoice.untaxed_amount + this.invoice.tax_amount)).normalize(), 'f')}</cbc:TaxInclusiveAmount>
     <py:if test="this.invoice.total_amount != (this.invoice.untaxed_amount + this.invoice.tax_amount)">
-        <cbc:PayableRoundingAmount py:attrs="{'currencyID': this.invoice.currency.code}">${-(this.invoice.total_amount - this.invoice.untaxed_amount - this.invoice.tax_amount)}</cbc:PayableRoundingAmount>
+        <cbc:PayableRoundingAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((-(this.invoice.total_amount - this.invoice.untaxed_amount - this.invoice.tax_amount)).normalize(), 'f')}</cbc:PayableRoundingAmount>
     </py:if>
-    <cbc:PrepaidAmount py:if="this.prepaid_amount" py:attrs="{'currencyID': this.invoice.currency.code}">${-this.prepaid_amount}</cbc:PrepaidAmount>
-    <cbc:PayableAmount py:attrs="{'currencyID': this.invoice.currency.code}">${-this.invoice.total_amount + this.prepaid_amount}</cbc:PayableAmount>
+    <cbc:PrepaidAmount py:if="this.prepaid_amount" py:attrs="{'currencyID': this.invoice.currency.code}">${format((-this.prepaid_amount).normalize(), 'f')}</cbc:PrepaidAmount>
+    <cbc:PayableAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((-this.invoice.total_amount + this.prepaid_amount).normalize(), 'f')}</cbc:PayableAmount>
 </cac:LegalMonetaryTotal>
 <cac:CreditNoteLine py:for="line_id, line in enumerate(this.lines, 1)">
     <cbc:ID>${line_id}</cbc:ID>
     <cbc:CreditedQuantity py:attrs="{'unitCode': line.unit.unece_code if line.unit and line.unit.unece_code else 'ZZ'}">${format(-Decimal(str(line.quantity)), 'f')}</cbc:CreditedQuantity>
-    <cbc:LineExtensionAmount py:attrs="{'currencyID': this.invoice.currency.code}">${-line.amount}</cbc:LineExtensionAmount>
+    <cbc:LineExtensionAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((-line.amount).normalize(), 'f')}</cbc:LineExtensionAmount>
     <cac:Item>
         <cbc:Description py:if="line.description">${line.description}</cbc:Description>
         <cbc:Name>${line.product.name if line.product else line.summary}</cbc:Name>
@@ -152,7 +152,7 @@ this repository contains the full copyright notices and license terms. -->
         </cac:ClassifiedTaxCategory>
     </cac:Item>
     <cac:Price>
-        <cbc:PriceAmount py:attrs="{'currencyID': this.invoice.currency.code}">${line.unit_price}</cbc:PriceAmount>
+        <cbc:PriceAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format(line.unit_price.normalize(), 'f')}</cbc:PriceAmount>
     </cac:Price>
 </cac:CreditNoteLine>
 </CreditNote>

{trytond_edocument_ubl-8.0.2 → trytond_edocument_ubl-8.0.4}/template/2/Invoice.xml

@@ -90,7 +90,7 @@ this repository contains the full copyright notices and license terms. -->
     <py:otherwise>
         <cac:PaymentTerms py:for="line in this.invoice.lines_to_pay">
             <cbc:Note py:if="this.invoice.payment_term and this.invoice.payment_term.description">${this.invoice.payment_term.description}</cbc:Note>
-            <cbc:Amount py:attrs="{'currencyID': this.invoice.currency.code}">${line.amount}</cbc:Amount>
+            <cbc:Amount py:attrs="{'currencyID': this.invoice.currency.code}">${format(line.amount.normalize(), 'f')}</cbc:Amount>
             <cbc:PaymentDueDate>${line.maturity_date}</cbc:PaymentDueDate>
         </cac:PaymentTerms>
     </py:otherwise>
@@ -101,16 +101,16 @@ this repository contains the full copyright notices and license terms. -->
         <cbc:AllowanceChargeReasonCode py:if="reason_code">${reason_code}</cbc:AllowanceChargeReasonCode>
     </py:with>
     <cbc:AllowanceChargeReason>${allowance_charge.product.name}</cbc:AllowanceChargeReason>
-    <cbc:Amount py:attrs="{'currencyID': this.invoice.currency.code}">${abs(allowance_charge.amount)}</cbc:Amount>
+    <cbc:Amount py:attrs="{'currencyID': this.invoice.currency.code}">${format(abs(allowance_charge.amount).normalize(), 'f')}</cbc:Amount>
     <cac:TaxCategory py:for="tax_line in allowance_charge.invoice_taxes">
         ${TaxCategory(tax_line.tax)}
     </cac:TaxCategory>
 </cac:AllowanceCharge>
 <cac:TaxTotal py:for="group, lines, amount in this.taxes">
-    <cbc:TaxAmount py:attrs="{'currencyID': this.invoice.currency.code}">${amount}</cbc:TaxAmount>
+    <cbc:TaxAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format(amount.normalize(), 'f')}</cbc:TaxAmount>
     <cac:TaxSubtotal py:for="line in lines">
-        <cbc:TaxableAmount py:attrs="{'currencyID': this.invoice.currency.code}">${line.base}</cbc:TaxableAmount>
-        <cbc:TaxAmount py:attrs="{'currencyID': this.invoice.currency.code}">${line.amount}</cbc:TaxAmount>
+        <cbc:TaxableAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format(line.base.normalize(), 'f')}</cbc:TaxableAmount>
+        <cbc:TaxAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format(line.amount.normalize(), 'f')}</cbc:TaxAmount>
         <cbc:Percent py:if="line.tax.type == 'percentage' and not (specification or '').startswith('peppol')">${format((line.tax.rate * 100).normalize(), 'f')}</cbc:Percent>
         <cac:TaxCategory>
             ${TaxCategory(line.tax)}
@@ -118,19 +118,19 @@ this repository contains the full copyright notices and license terms. -->
     </cac:TaxSubtotal>
 </cac:TaxTotal>
 <cac:LegalMonetaryTotal>
-    <cbc:LineExtensionAmount py:attrs="{'currencyID': this.invoice.currency.code}">${this.invoice.untaxed_amount}</cbc:LineExtensionAmount>
-    <cbc:TaxExclusiveAmount py:attrs="{'currencyID': this.invoice.currency.code}">${this.invoice.untaxed_amount}</cbc:TaxExclusiveAmount>
-    <cbc:TaxInclusiveAmount py:attrs="{'currencyID': this.invoice.currency.code}">${this.invoice.untaxed_amount + this.invoice.tax_amount}</cbc:TaxInclusiveAmount>
+    <cbc:LineExtensionAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format(this.invoice.untaxed_amount.normalize(), 'f')}</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format(this.invoice.untaxed_amount.normalize(), 'f')}</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((this.invoice.untaxed_amount + this.invoice.tax_amount).normalize(), 'f')}</cbc:TaxInclusiveAmount>
     <py:if test="this.invoice.total_amount != (this.invoice.untaxed_amount + this.invoice.tax_amount)">
-        <cbc:PayableRoundingAmount py:attrs="{'currencyID': this.invoice.currency.code}">${this.invoice.total_amount - this.invoice.untaxed_amount - this.invoice.tax_amount}</cbc:PayableRoundingAmount>
+        <cbc:PayableRoundingAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((this.invoice.total_amount - this.invoice.untaxed_amount - this.invoice.tax_amount).normalize(), 'f')}</cbc:PayableRoundingAmount>
     </py:if>
-    <cbc:PrepaidAmount py:if="this.prepaid_amount" py:attrs="{'currencyID': this.invoice.currency.code}">${this.prepaid_amount}</cbc:PrepaidAmount>
-    <cbc:PayableAmount py:attrs="{'currencyID': this.invoice.currency.code}">${this.invoice.total_amount - this.prepaid_amount}</cbc:PayableAmount>
+    <cbc:PrepaidAmount py:if="this.prepaid_amount" py:attrs="{'currencyID': this.invoice.currency.code}">${format(this.prepaid_amount.normalize(), 'f')}</cbc:PrepaidAmount>
+    <cbc:PayableAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format((this.invoice.total_amount - this.prepaid_amount).normalize(), 'f')}</cbc:PayableAmount>
 </cac:LegalMonetaryTotal>
 <cac:InvoiceLine py:for="line_id, line in enumerate(this.lines, 1)">
     <cbc:ID>${line_id}</cbc:ID>
     <cbc:InvoicedQuantity py:attrs="{'unitCode': line.unit.unece_code if line.unit and line.unit.unece_code else 'ZZ'}">${format(Decimal(str(line.quantity)), 'f')}</cbc:InvoicedQuantity>
-    <cbc:LineExtensionAmount py:attrs="{'currencyID': this.invoice.currency.code}">${line.amount}</cbc:LineExtensionAmount>
+    <cbc:LineExtensionAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format(line.amount.normalize(), 'f')}</cbc:LineExtensionAmount>
     <cac:Item>
         <cbc:Description py:if="line.description">${line.description}</cbc:Description>
         <cbc:Name>${line.product.name if line.product else line.summary}</cbc:Name>
@@ -152,7 +152,7 @@ this repository contains the full copyright notices and license terms. -->
         </cac:ClassifiedTaxCategory>
     </cac:Item>
     <cac:Price>
-        <cbc:PriceAmount py:attrs="{'currencyID': this.invoice.currency.code}">${line.unit_price}</cbc:PriceAmount>
+        <cbc:PriceAmount py:attrs="{'currencyID': this.invoice.currency.code}">${format(line.unit_price.normalize(), 'f')}</cbc:PriceAmount>
     </cac:Price>
 </cac:InvoiceLine>
 </Invoice>

{trytond_edocument_ubl-8.0.2 → trytond_edocument_ubl-8.0.4}/tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=8.0.2
+version=8.0.4
 depends:
     edocument_unece
     ir