@fin.cx/einvoice 8.2.3 → 8.2.4

package/ts/formats/cii/zugferd/zugferd.encoder.ts

@@ -7,6 +7,7 @@ import { getDocumentTypeCode } from '../../utils/document.typecode.js';
 import { getWritableDate, getWritableDueDate } from '../../utils/date.value.js';
 import { getPaymentTermsNote } from '../../utils/payment.terms.js';
 import { computeDocumentTotals } from '../../utils/document.totals.js';
+import { toPlainDecimalString } from '../../utils/number.text.js';
 
 /**
  * Encoder for ZUGFeRD invoice format
@@ -34,6 +35,9 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
     this.addCommonInvoiceData(xmlDoc, creditNote);
 
     // Serialize to string
+    // the schema order of every element, whatever order the passes above added them in
+    this.orderCiiElements(xmlDoc);
+
     return new XMLSerializer().serializeToString(xmlDoc);
   }
 
@@ -53,6 +57,9 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
     this.addCommonInvoiceData(xmlDoc, invoice);
 
     // Serialize to string
+    // the schema order of every element, whatever order the passes above added them in
+    this.orderCiiElements(xmlDoc);
+
     return new XMLSerializer().serializeToString(xmlDoc);
   }
 
@@ -219,14 +226,15 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
     const sellerElement = doc.createElement('ram:SellerTradeParty');
     this.addPartyInfo(doc, sellerElement, invoice.from);
     
-    // Add seller electronic address if available
+    // Seller electronic address (BT-34): ram:URIUniversalCommunication/ram:URIID of the party; a
+    // trade contact (ram:DefinedTradeContact) has no URIID
     if (invoice.electronicAddress && invoice.from.type === 'company') {
-      const contactElement = doc.createElement('ram:DefinedTradeContact');
+      const communicationElement = doc.createElement('ram:URIUniversalCommunication');
       const uriElement = doc.createElement('ram:URIID');
       uriElement.setAttribute('schemeID', invoice.electronicAddress.scheme);
       uriElement.textContent = invoice.electronicAddress.value;
-      contactElement.appendChild(uriElement);
-      sellerElement.appendChild(contactElement);
+      communicationElement.appendChild(uriElement);
+      sellerElement.appendChild(communicationElement);
     }
     
     agreementElement.appendChild(sellerElement);
@@ -334,33 +342,6 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
       deliveryDateElement.appendChild(occurrenceDateElement);
       deliveryElement.appendChild(deliveryDateElement);
     }
-
-    // Add period of performance if available
-    if (invoice.periodOfPerformance) {
-      const periodElement = doc.createElement('ram:BillingSpecifiedPeriod');
-      
-      // Start date
-      if (invoice.periodOfPerformance.from !== undefined) {
-        const startDateElement = doc.createElement('ram:StartDateTime');
-        const startDateStringElement = doc.createElement('udt:DateTimeString');
-        startDateStringElement.setAttribute('format', '102'); // YYYYMMDD format
-        startDateStringElement.textContent = this.formatDateYYYYMMDD(invoice.periodOfPerformance.from, 'BT-73 invoicing period start date');
-        startDateElement.appendChild(startDateStringElement);
-        periodElement.appendChild(startDateElement);
-      }
-      
-      // End date
-      if (invoice.periodOfPerformance.to !== undefined) {
-        const endDateElement = doc.createElement('ram:EndDateTime');
-        const endDateStringElement = doc.createElement('udt:DateTimeString');
-        endDateStringElement.setAttribute('format', '102'); // YYYYMMDD format
-        endDateStringElement.textContent = this.formatDateYYYYMMDD(invoice.periodOfPerformance.to, 'BT-74 invoicing period end date');
-        endDateElement.appendChild(endDateStringElement);
-        periodElement.appendChild(endDateElement);
-      }
-      
-      deliveryElement.appendChild(periodElement);
-    }
   }
 
   /**
@@ -448,6 +429,33 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
     // Add tax details
     this.addTaxDetails(doc, settlementElement, invoice);
 
+    // Invoicing period (BG-14): in the header settlement, where the CII schema puts it
+    if (invoice.periodOfPerformance) {
+      const periodElement = doc.createElement('ram:BillingSpecifiedPeriod');
+      
+      // Start date
+      if (invoice.periodOfPerformance.from !== undefined) {
+        const startDateElement = doc.createElement('ram:StartDateTime');
+        const startDateStringElement = doc.createElement('udt:DateTimeString');
+        startDateStringElement.setAttribute('format', '102'); // YYYYMMDD format
+        startDateStringElement.textContent = this.formatDateYYYYMMDD(invoice.periodOfPerformance.from, 'BT-73 invoicing period start date');
+        startDateElement.appendChild(startDateStringElement);
+        periodElement.appendChild(startDateElement);
+      }
+      
+      // End date
+      if (invoice.periodOfPerformance.to !== undefined) {
+        const endDateElement = doc.createElement('ram:EndDateTime');
+        const endDateStringElement = doc.createElement('udt:DateTimeString');
+        endDateStringElement.setAttribute('format', '102'); // YYYYMMDD format
+        endDateStringElement.textContent = this.formatDateYYYYMMDD(invoice.periodOfPerformance.to, 'BT-74 invoicing period end date');
+        endDateElement.appendChild(endDateStringElement);
+        periodElement.appendChild(endDateElement);
+      }
+      
+      settlementElement.appendChild(periodElement);
+    }
+
     // Add totals
     this.addMonetarySummation(doc, settlementElement, invoice);
   }
@@ -581,7 +589,8 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
         const agreementElement = doc.createElement('ram:SpecifiedLineTradeAgreement');
         const priceElement = doc.createElement('ram:NetPriceProductTradePrice');
         const chargeAmountElement = doc.createElement('ram:ChargeAmount');
-        chargeAmountElement.textContent = item.unitNetPrice.toFixed(2);
+        // Item net price (BT-146) with the precision it has; EN 16931 does not limit its decimals
+        chargeAmountElement.textContent = toPlainDecimalString(item.unitNetPrice);
         priceElement.appendChild(chargeAmountElement);
         agreementElement.appendChild(priceElement);
         lineItemElement.appendChild(agreementElement);
@@ -589,7 +598,7 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
         // Add delivery information (quantity)
         const deliveryElement = doc.createElement('ram:SpecifiedLineTradeDelivery');
         const quantityElement = doc.createElement('ram:BilledQuantity');
-        quantityElement.textContent = item.unitQuantity.toString();
+        quantityElement.textContent = toPlainDecimalString(item.unitQuantity); // BT-129
         // a line without a unit is written without one, so that BR-23 reports it
         if (item.unitType) {
           quantityElement.setAttribute('unitCode', item.unitType);

package/ts/formats/ubl/generic/ubl.encoder.ts

@@ -7,6 +7,7 @@ import { getPrecedingInvoiceReferences } from '../../utils/preceding.invoice.js'
 import { getWritableDueDate } from '../../utils/date.value.js';
 import { getPaymentTermsNote } from '../../utils/payment.terms.js';
 import { computeDocumentTotals } from '../../utils/document.totals.js';
+import { toPlainDecimalString } from '../../utils/number.text.js';
 
 /**
  * UBL Encoder implementation
@@ -495,7 +496,7 @@ export class UBLEncoder extends UBLBaseEncoder {
       if (item.unitType) {
         quantityElement.setAttribute('unitCode', item.unitType);
       }
-      quantityElement.textContent = item.unitQuantity.toString();
+      quantityElement.textContent = toPlainDecimalString(item.unitQuantity); // BT-129
       invoiceLineNode.appendChild(quantityElement);
       
       // Invoice line net amount (BT-131): quantity × net price, rounded
@@ -542,7 +543,8 @@ export class UBLEncoder extends UBLBaseEncoder {
       // Price amount
       const priceAmountElement = doc.createElement('cbc:PriceAmount');
       priceAmountElement.setAttribute('currencyID', invoice.currency);
-      priceAmountElement.textContent = item.unitNetPrice.toFixed(2);
+      // Item net price (BT-146) with the precision it has; EN 16931 does not limit its decimals
+      priceAmountElement.textContent = toPlainDecimalString(item.unitNetPrice);
       priceNode.appendChild(priceAmountElement);
     }
   }

package/ts/formats/utils/document.totals.ts

@@ -1,6 +1,7 @@
 import type { TAccountingDoc } from '../../interfaces/common.js';
 import { Decimal } from './decimal.js';
 import { DecimalCurrencyCalculator } from './currency.calculator.decimal.js';
+import { toPlainDecimalString } from './number.text.js';
 import { EInvoiceFormatError } from '../../errors.js';
 import type { ValidationResult } from '../validation/validation.types.js';
 import { getVatCategory, getVatExemption, type IVatExemption, type TVatCategoryCode } from './vat.category.js';
@@ -130,7 +131,12 @@ export const computeDocumentTotals = (
     );
   }
   for (const item of accountingDoc.items ?? []) {
-    const lineNet = calculator.calculateLineNet(item.unitQuantity, item.unitNetPrice);
+    // quantity × net price from the numerals the encoders write, so the line net amount is the
+    // product of the written values, at their full precision
+    const lineNet = calculator.calculateLineNet(
+      toPlainDecimalString(item.unitQuantity),
+      toPlainDecimalString(item.unitNetPrice),
+    );
     lineNetAmounts.push(lineNet);
     lineVatCategories.push(category);
     // grouped by VAT category and rate: the same rate under two categories is two groups

package/ts/formats/utils/number.text.ts

@@ -0,0 +1,25 @@
+/**
+ * A finite number as a plain decimal numeral (`xsd:decimal`), the shortest one
+ * that reads back as the same number, without an exponent: `0.335`, `1234.5`,
+ * `0.0000001` (not `1e-7`). Quantities (BT-129) and net prices (BT-146) are
+ * written this way, with the precision they have; EN 16931 limits neither to
+ * two decimals (BR-DEC-* cover amounts only).
+ * @param value A finite number
+ */
+export const toPlainDecimalString = (value: number): string => {
+  const text = String(value);
+  const match = /^(-?)(\d+)(?:\.(\d+))?e([+-]\d+)$/i.exec(text);
+  if (!match) {
+    return text;
+  }
+  const [, sign, integerDigits, fractionDigits = '', exponentText] = match;
+  const digits = integerDigits + fractionDigits;
+  const point = integerDigits.length + Number(exponentText);
+  if (point <= 0) {
+    return `${sign}0.${'0'.repeat(-point)}${digits}`;
+  }
+  if (point >= digits.length) {
+    return `${sign}${digits}${'0'.repeat(point - digits.length)}`;
+  }
+  return `${sign}${digits.slice(0, point)}.${digits.slice(point)}`;
+};