@fin.cx/einvoice 8.2.0 → 8.2.1

package/ts/formats/base/base.decoder.ts

@@ -59,14 +59,15 @@ export abstract class BaseDecoder {
       const year = parseInt(dateStr.substring(0, 4));
       const month = parseInt(dateStr.substring(4, 6)) - 1; // Month is 0-indexed in JS
       const day = parseInt(dateStr.substring(6, 8));
-      return new Date(year, month, day).getTime();
+      // a calendar day is its UTC midnight, whatever the server's zone
+      return Date.UTC(year, month, day);
     }
     
     // Format 610 is YYYYMM  
     if (format === '610' && dateStr.length === 6) {
       const year = parseInt(dateStr.substring(0, 4));
       const month = parseInt(dateStr.substring(4, 6)) - 1;
-      return new Date(year, month, 1).getTime();
+      return Date.UTC(year, month, 1);
     }
 
     // Try to parse as ISO date or other standard formats

package/ts/formats/cii/cii.decoder.ts

@@ -127,6 +127,37 @@ export abstract class CIIBaseDecoder extends BaseDecoder {
     return references;
   }
 
+  /**
+   * Reads the invoice issue date (BT-2); a missing or invalid one is refused
+   * with an `EInvoiceParsingError`, as no other date can stand in for it.
+   */
+  protected extractIssueDate(): number {
+    const issueDatePath = '/rsm:CrossIndustryInvoice/rsm:ExchangedDocument/ram:IssueDateTime/udt:DateTimeString';
+    return this.parseRequiredCIIDate(this.getText(issueDatePath), this.getText(`${issueDatePath}/@format`).trim());
+  }
+
+  /**
+   * Reads the payment due date (BT-9) of the header payment terms; undefined
+   * when the document states none.
+   */
+  protected extractDueDate(): number | undefined {
+    const dueDatePath =
+      '/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DueDateDateTime/udt:DateTimeString';
+    const dueDate = this.getText(dueDatePath).trim();
+    if (!dueDate) {
+      return undefined;
+    }
+    return this.parseRequiredCIIDate(dueDate, this.getText(`${dueDatePath}/@format`).trim());
+  }
+
+  /**
+   * The payment term in days from the issue date to the stated due date, or
+   * `absentDueInDays` when the document states no due date.
+   */
+  protected dueInDaysOf(issueDate: number, dueDate: number | undefined, absentDueInDays: number): number {
+    return dueDate === undefined ? absentDueInDays : Math.round((dueDate - issueDate) / (1000 * 60 * 60 * 24));
+  }
+
   /**
    * Reads the actual delivery date (BT-72) of the header delivery; undefined
    * when the document does not state one.

package/ts/formats/cii/facturx/facturx.decoder.ts

@@ -67,10 +67,8 @@ export class FacturXDecoder extends CIIBaseDecoder {
     const items = this.extractItems();
 
     // Extract due date
-    const dueDateStr = this.getText('//ram:SpecifiedTradePaymentTerms/ram:DueDateDateTime/udt:DateTimeString');
-    const dueDateFormat = this.getText('//ram:SpecifiedTradePaymentTerms/ram:DueDateDateTime/udt:DateTimeString/@format');
-    const dueDate = dueDateStr ? this.parseCIIDate(dueDateStr, dueDateFormat) : issueDate;
-    const dueInDays = Math.round((dueDate - issueDate) / (1000 * 60 * 60 * 24));
+    // no due date stated: `dueInDays` cannot express it yet (required field in @tsclass/tsclass); value unchanged: 0 days
+    const dueInDays = this.dueInDaysOf(issueDate, this.extractDueDate(), 0);
 
     // Extract currency
     const currencyCode = this.getText('//ram:InvoiceCurrencyCode') || 'EUR';

package/ts/formats/cii/facturx/facturx.encoder.ts

@@ -6,7 +6,7 @@ import { Decimal } from '../../utils/decimal.js';
 import { DecimalCurrencyCalculator } from '../../utils/currency.calculator.decimal.js';
 import { getCurrencyMinorUnits } from '../../utils/currency.utils.js';
 import { getDocumentTypeCode } from '../../utils/document.typecode.js';
-import { getWritableDate } from '../../utils/date.value.js';
+import { getWritableDate, getWritableDueDate } from '../../utils/date.value.js';
 
 /**
  * Encoder for Factur-X invoice format
@@ -325,8 +325,7 @@ export class FacturXEncoder extends CIIBaseEncoder {
     dateStringElement.setAttribute('format', '102'); // YYYYMMDD format
 
     // Calculate due date
-    const dueDate = new Date(invoice.date);
-    dueDate.setDate(dueDate.getDate() + invoice.dueInDays);
+    const dueDate = getWritableDueDate(invoice.date, invoice.dueInDays, 'cii');
 
     dateStringElement.textContent = this.formatDateYYYYMMDD(dueDate.getTime(), 'BT-9 payment due date');
     dueDateElement.appendChild(dateStringElement);
@@ -493,9 +492,10 @@ export class FacturXEncoder extends CIIBaseEncoder {
    */
   private formatDateYYYYMMDD(timestamp: number, field: string): string {
     const date = getWritableDate(timestamp, field, 'cii');
-    const year = date.getFullYear();
-    const month = (date.getMonth() + 1).toString().padStart(2, '0');
-    const day = date.getDate().toString().padStart(2, '0');
+    // the UTC fields: a calendar day is its UTC midnight, whatever the server's zone
+    const year = date.getUTCFullYear();
+    const month = (date.getUTCMonth() + 1).toString().padStart(2, '0');
+    const day = date.getUTCDate().toString().padStart(2, '0');
     return `${year}${month}${day}`;
   }
 }

package/ts/formats/cii/zugferd/zugferd.decoder.ts

@@ -44,9 +44,7 @@ export class ZUGFeRDDecoder extends CIIBaseDecoder {
     const invoiceId = this.getText('//rsm:ExchangedDocument/ram:ID');
 
     // Extract issue date
-    const issueDateStr = this.getText('//ram:IssueDateTime/udt:DateTimeString');
-    const issueDateFormat = this.getText('//ram:IssueDateTime/udt:DateTimeString/@format');
-    const issueDate = this.parseCIIDate(issueDateStr, issueDateFormat);
+    const issueDate = this.extractIssueDate();
 
     // Extract seller information
     const seller = this.extractParty('//ram:SellerTradeParty');
@@ -58,9 +56,8 @@ export class ZUGFeRDDecoder extends CIIBaseDecoder {
     const items = this.extractItems();
 
     // Extract due date
-    const dueDateStr = this.getText('//ram:SpecifiedTradePaymentTerms/ram:DueDateDateTime/udt:DateTimeString');
-    const dueDate = dueDateStr ? new Date(dueDateStr).getTime() : Date.now();
-    const dueInDays = Math.round((dueDate - issueDate) / (1000 * 60 * 60 * 24));
+    // no due date stated: `dueInDays` cannot express it yet (required field in @tsclass/tsclass); value unchanged: the days from the issue date to the moment of decoding
+    const dueInDays = this.dueInDaysOf(issueDate, this.extractDueDate(), Math.round((Date.now() - issueDate) / (1000 * 60 * 60 * 24)));
 
     // Extract currency
     const currencyCode = this.getText('//ram:InvoiceCurrencyCode') || 'EUR';

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

@@ -4,7 +4,8 @@ import { ZUGFERD_PROFILE_IDS } from './zugferd.types.js';
 import { CIIProfile } from '../cii.types.js';
 import { DOMParser, XMLSerializer } from '../../../plugins.js';
 import { getDocumentTypeCode } from '../../utils/document.typecode.js';
-import { getWritableDate } from '../../utils/date.value.js';
+import { getWritableDate, getWritableDueDate } from '../../utils/date.value.js';
+import { getPaymentTermsNote } from '../../utils/payment.terms.js';
 
 /**
  * Encoder for ZUGFeRD invoice format
@@ -382,7 +383,10 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
     if (invoice.paymentOptions) {
       // Add payment instructions as description - this is generic enough to work with any payment type
       const descriptionElement = doc.createElement('ram:Description');
-      descriptionElement.textContent = `Due in ${invoice.dueInDays} days. ${invoice.paymentOptions.description || ''}`;
+      descriptionElement.textContent = [
+        getPaymentTermsNote(invoice.date, invoice.dueInDays, invoice.language, 'cii'),
+        invoice.paymentOptions.description,
+      ].filter(Boolean).join('. ');
       paymentTermsElement.appendChild(descriptionElement);
     }
 
@@ -392,8 +396,7 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
     dateStringElement.setAttribute('format', '102'); // YYYYMMDD format
 
     // Calculate due date
-    const dueDate = new Date(invoice.date);
-    dueDate.setDate(dueDate.getDate() + invoice.dueInDays);
+    const dueDate = getWritableDueDate(invoice.date, invoice.dueInDays, 'cii');
 
     dateStringElement.textContent = this.formatDateYYYYMMDD(dueDate.getTime(), 'BT-9 payment due date');
     dueDateElement.appendChild(dateStringElement);
@@ -661,9 +664,10 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
    */
   private formatDateYYYYMMDD(timestamp: number, field: string): string {
     const date = getWritableDate(timestamp, field, 'cii');
-    const year = date.getFullYear();
-    const month = (date.getMonth() + 1).toString().padStart(2, '0');
-    const day = date.getDate().toString().padStart(2, '0');
+    // the UTC fields: a calendar day is its UTC midnight, whatever the server's zone
+    const year = date.getUTCFullYear();
+    const month = (date.getUTCMonth() + 1).toString().padStart(2, '0');
+    const day = date.getUTCDate().toString().padStart(2, '0');
     return `${year}${month}${day}`;
   }
 }

package/ts/formats/cii/zugferd/zugferd.v1.decoder.ts

@@ -35,6 +35,31 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
     };
   }
 
+  /**
+   * Reads the issue date of the v1 header (`rsm:HeaderExchangedDocument`); a
+   * missing or invalid one is refused with an `EInvoiceParsingError`.
+   */
+  protected override extractIssueDate(): number {
+    const issueDatePath = '/rsm:CrossIndustryDocument/rsm:HeaderExchangedDocument/ram:IssueDateTime/udt:DateTimeString';
+    return this.parseRequiredCIIDate(this.v1Text(issueDatePath), this.v1Text(`${issueDatePath}/@format`));
+  }
+
+  /**
+   * Reads the payment due date of the v1 header payment terms; undefined when
+   * the document states none.
+   */
+  protected override extractDueDate(): number | undefined {
+    const dueDatePath =
+      '/rsm:CrossIndustryDocument/rsm:SpecifiedSupplyChainTradeTransaction/ram:ApplicableSupplyChainTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DueDateDateTime/udt:DateTimeString';
+    const dueDate = this.v1Text(dueDatePath);
+    return dueDate ? this.parseRequiredCIIDate(dueDate, this.v1Text(`${dueDatePath}/@format`)) : undefined;
+  }
+
+  /** The trimmed text of the first node a v1 path selects, or '' */
+  private v1Text(path: string): string {
+    return String(zugferdV1Select(`string(${path})`, this.doc)).trim();
+  }
+
   /**
    * Reads the actual delivery date of the v1 header delivery
    * (`ram:ApplicableSupplyChainTradeDelivery`); undefined when the document
@@ -82,9 +107,7 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
     const invoiceId = this.getText('//ram:ID');
 
     // Extract issue date
-    const issueDateStr = this.getText('//ram:IssueDateTime/udt:DateTimeString');
-    const issueDateFormat = this.getText('//ram:IssueDateTime/udt:DateTimeString/@format');
-    const issueDate = this.parseCIIDate(issueDateStr, issueDateFormat);
+    const issueDate = this.extractIssueDate();
 
     // Extract seller information
     const seller = this.extractParty('//ram:SellerTradeParty');
@@ -96,9 +119,8 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
     const items = this.extractItems();
 
     // Extract due date
-    const dueDateStr = this.getText('//ram:SpecifiedTradePaymentTerms/ram:DueDateDateTime/udt:DateTimeString');
-    const dueDate = dueDateStr ? new Date(dueDateStr).getTime() : Date.now();
-    const dueInDays = Math.round((dueDate - issueDate) / (1000 * 60 * 60 * 24));
+    // no due date stated: `dueInDays` cannot express it yet (required field in @tsclass/tsclass); value unchanged: 0 days, what this decoder returned before it read the v1 dates
+    const dueInDays = this.dueInDaysOf(issueDate, this.extractDueDate(), 0);
 
     // Extract currency
     const currencyCode = this.getText('//ram:InvoiceCurrencyCode') || 'EUR';

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

@@ -4,7 +4,8 @@ import { UBLDocumentType } from '../ubl.types.js';
 import { DOMParser, XMLSerializer } from '../../../plugins.js';
 import { getDocumentTypeCode } from '../../utils/document.typecode.js';
 import { getPrecedingInvoiceReferences } from '../../utils/preceding.invoice.js';
-import { getWritableDate } from '../../utils/date.value.js';
+import { getWritableDueDate } from '../../utils/date.value.js';
+import { getPaymentTermsNote } from '../../utils/payment.terms.js';
 
 /**
  * UBL Encoder implementation
@@ -81,8 +82,7 @@ export class UBLEncoder extends UBLBaseEncoder {
     
     // Due Date - the CreditNote schema has no DueDate element; its payment due date lives in cac:PaymentMeans
     if (documentType === UBLDocumentType.INVOICE) {
-      const dueDate = getWritableDate(invoice.date, 'BT-2 invoice issue date', 'ubl');
-      dueDate.setDate(dueDate.getDate() + (invoice.dueInDays || 30));
+      const dueDate = getWritableDueDate(invoice.date, invoice.dueInDays, 'ubl');
       this.appendElement(doc, root, 'cbc:DueDate', this.formatDate(dueDate.getTime(), 'BT-9 payment due date'));
     }
     // Document Type Code (380 invoice, 381 credit note, 383 debit note, 384 corrected invoice, 389 self-billed invoice; the element differs per schema)
@@ -319,7 +319,7 @@ export class UBLEncoder extends UBLBaseEncoder {
     parentElement.appendChild(paymentTermsNode);
     
     // Payment terms note
-    this.appendElement(doc, paymentTermsNode, 'cbc:Note', `Due in ${invoice.dueInDays} days`);
+    this.appendElement(doc, paymentTermsNode, 'cbc:Note', getPaymentTermsNote(invoice.date, invoice.dueInDays, invoice.language, 'ubl'));
     
     // Add payment means if available
     if (invoice.paymentOptions) {
@@ -346,8 +346,7 @@ export class UBLEncoder extends UBLBaseEncoder {
     this.appendElement(doc, paymentMeansNode, 'cbc:PaymentMeansCode', '30');
     
     // Payment due date, counted from the issue date the document states
-    const dueDate = getWritableDate(invoice.date, 'BT-2 invoice issue date', 'ubl');
-    dueDate.setDate(dueDate.getDate() + (invoice.dueInDays || 30));
+    const dueDate = getWritableDueDate(invoice.date, invoice.dueInDays, 'ubl');
     this.appendElement(doc, paymentMeansNode, 'cbc:PaymentDueDate', this.formatDate(dueDate.getTime(), 'BT-9 payment due date'));
     
     // Add payment channel code if available

package/ts/formats/ubl/ubl.types.ts

@@ -17,8 +17,14 @@ export enum UBLDocumentType {
   CREDIT_NOTE = 'CreditNote'
 }
 
-// UBL customization IDs for different formats
+// UBL customization IDs (specification identifier, BT-24) for different formats
 export const UBL_CUSTOMIZATION_IDS = {
-  XRECHNUNG: 'urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.0',
+  /**
+   * XRechnung 3.0 (CIUS), as the KoSIT XRechnung Schematron defines it (`XR-CIUS-ID` in
+   * common.sch: 'urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_' and
+   * the version '3.0'). XRechnung 1.x and 2.x used the prefix
+   * 'urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_'.
+   */
+  XRECHNUNG: 'urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0',
   PEPPOL_BIS: 'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0'
 };

package/ts/formats/ubl/xrechnung/xrechnung.decoder.ts

@@ -60,14 +60,18 @@ export class XRechnungDecoder extends UBLBaseDecoder {
       const issueDate = this.parseRequiredUblDate(issueDateText);
       const currencyCode = this.getText('//cbc:DocumentCurrencyCode', this.doc) || 'EUR';
 
-      // Extract payment terms
-      let dueInDays = 30; // Default
-      const dueDateText = this.getText('//cac:PaymentTerms/cbc:PaymentDueDate', this.doc);
+      // The payment due date (BT-9): cbc:DueDate on an Invoice, cac:PaymentMeans/cbc:PaymentDueDate
+      // on a CreditNote, cac:PaymentTerms/cbc:PaymentDueDate as a last resort; the payment term in
+      // days is the calendar days from the issue date to it.
+      // no due date stated: `dueInDays` cannot express it yet (required field in @tsclass/tsclass); value unchanged: 30 days
+      let dueInDays = 30;
+      const dueDateText = (
+        this.getText('/*/cbc:DueDate', this.doc) ||
+        this.getText('/*/cac:PaymentMeans/cbc:PaymentDueDate', this.doc) ||
+        this.getText('/*/cac:PaymentTerms/cbc:PaymentDueDate', this.doc)
+      ).trim();
       if (dueDateText) {
-        const dueDateObj = new Date(dueDateText);
-        const issueDateObj = new Date(issueDate);
-        const diffTime = Math.abs(dueDateObj.getTime() - issueDateObj.getTime());
-        dueInDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+        dueInDays = Math.round((this.parseRequiredUblDate(dueDateText) - issueDate) / (1000 * 60 * 60 * 24));
       }
 
       // Extract items

package/ts/formats/ubl/xrechnung/xrechnung.encoder.ts

@@ -1,6 +1,7 @@
 import { UBLEncoder } from '../generic/ubl.encoder.js';
 import type { TAccountingDoc, TCreditNote, TInvoiceDocument } from '../../../interfaces/common.js';
 import { DOMParser, XMLSerializer } from '../../../plugins.js';
+import { UBL_CUSTOMIZATION_IDS } from '../ubl.types.js';
 
 /**
  * Encoder for XRechnung (UBL) format
@@ -52,10 +53,10 @@ export class XRechnungEncoder extends UBLEncoder {
     // Extract metadata if available
     const metadata = (invoice as any).metadata?.extensions;
     
-    // Update Customization ID to XRechnung 2.0
+    // Specification identifier (BT-24): XRechnung 3.0
     const customizationId = root.getElementsByTagName('cbc:CustomizationID')[0];
     if (customizationId) {
-      customizationId.textContent = 'urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.0';
+      customizationId.textContent = UBL_CUSTOMIZATION_IDS.XRECHNUNG;
     }
     
     // Add or update Buyer Reference (required for XRechnung)
@@ -73,15 +74,6 @@ export class XRechnungEncoder extends UBLEncoder {
       buyerRef.textContent = buyerReferenceValue;
     }
     
-    // Update payment terms to German
-    const paymentTermsNotes = root.getElementsByTagName('cac:PaymentTerms');
-    if (paymentTermsNotes.length > 0) {
-      const noteElement = paymentTermsNotes[0].getElementsByTagName('cbc:Note')[0];
-      if (noteElement && noteElement.textContent) {
-        noteElement.textContent = `Zahlung innerhalb von ${invoice.dueInDays || 30} Tagen`;
-      }
-    }
-    
     // Add electronic address for parties if available
     this.addElectronicAddressToParty(doc, 'cac:AccountingSupplierParty', invoice.from);
     this.addElectronicAddressToParty(doc, 'cac:AccountingCustomerParty', invoice.to);

package/ts/formats/utils/date.value.ts

@@ -1,5 +1,14 @@
 import { EInvoiceFormatError } from '../../errors.js';
 
+/**
+ * Calendar dates (BT-2, BT-7, BT-9, BT-26, BT-72, BT-73, BT-74) carry no time
+ * of day and no time zone: UBL writes them as `xsd:date`, CII in format 102
+ * (`YYYYMMDD`). In the accounting document envelope such a day is the UTC
+ * midnight of that day, which is what the decoders return. The encoders write
+ * it with the UTC fields of the date and count days in UTC, so the day
+ * written does not depend on the time zone of the machine that writes it.
+ */
+
 /**
  * The date an encoder is about to write, as a `Date`. A value that is no
  * finite timestamp, or lies outside the range of a JavaScript date, is refused
@@ -19,3 +28,25 @@ export const getWritableDate = (timestamp: unknown, field: string, targetFormat:
   }
   return date;
 };
+
+/**
+ * The payment due date (BT-9) a document states: its issue date plus
+ * `dueInDays` calendar days. `0` is due on the issue date. A `dueInDays` that
+ * is no whole number of days is refused with an `EInvoiceFormatError`; no other
+ * term is put in its place.
+ * @param issueTimestamp The issue date (BT-2)
+ * @param dueInDays The payment term in days, as the document states it
+ * @param targetFormat The format being written
+ */
+export const getWritableDueDate = (issueTimestamp: unknown, dueInDays: unknown, targetFormat: string): Date => {
+  const dueDate = getWritableDate(issueTimestamp, 'BT-2 invoice issue date', targetFormat);
+  if (typeof dueInDays !== 'number' || !Number.isInteger(dueInDays)) {
+    throw new EInvoiceFormatError(`BT-9 payment due date: dueInDays is no whole number of days: ${String(dueInDays)}`, {
+      targetFormat,
+      unsupportedFeatures: ['BT-9 payment due date'],
+    });
+  }
+  // calendar days counted in UTC: a calendar day is its UTC midnight, whatever the server's zone
+  dueDate.setUTCDate(dueDate.getUTCDate() + dueInDays);
+  return dueDate;
+};

package/ts/formats/utils/format.detector.ts

@@ -80,7 +80,9 @@ export class FormatDetector {
       );
       const customizationId = customizationIdMatch?.[1] ?? '';
 
-      if (/xrechnung/i.test(customizationId) || /urn:xoev-de:kosit:standard:xrechnung/i.test(customizationId)) {
+      // both identifier families: urn:xeinkauf.de:kosit:xrechnung_3.0 (XRechnung 3.0) and
+      // urn:xoev-de:kosit:standard:xrechnung_x.y (XRechnung 1.x and 2.x)
+      if (/xrechnung/i.test(customizationId)) {
         return InvoiceFormat.XRECHNUNG;
       }
       return InvoiceFormat.UBL;
@@ -133,10 +135,8 @@ export class FormatDetector {
     }
 
     // Check for obvious XRechnung indicators
-    if (
-      /xrechnung/i.test(sample) ||
-      /urn:xoev-de:kosit:standard:xrechnung/i.test(sample)
-    ) {
+    // covers both identifier families (urn:xeinkauf.de:kosit:xrechnung_, urn:xoev-de:kosit:standard:xrechnung_)
+    if (/xrechnung/i.test(sample)) {
       return InvoiceFormat.XRECHNUNG;
     }
 

package/ts/formats/utils/payment.terms.ts

@@ -0,0 +1,37 @@
+import { getWritableDueDate } from './date.value.js';
+
+/**
+ * The payment terms note (BT-20) the encoders write: the due date (BT-9) the
+ * document states, in the document language (German for `de`, English
+ * otherwise). It names the date rather than a count of days, so it reads
+ * correctly for every term:
+ * - a term of 0 days: "Zahlbar sofort" / "Payable immediately";
+ * - a later due date: "Zahlbar bis 04.10.2026" / "Payable by 2026-10-04";
+ * - an earlier due date, which is legitimate when the payment fell due before
+ *   the invoice was issued, as with an agreed advance payment or an invoice
+ *   issued after the contractual due date: "Fällig seit dem 03.09.2026" /
+ *   "Due since 2026-09-03".
+ * A term that is no whole number of days is refused by `getWritableDueDate`.
+ * @param issueTimestamp The issue date (BT-2)
+ * @param dueInDays The payment term in days, as the document states it
+ * @param language The document language
+ * @param targetFormat The format being written
+ */
+export const getPaymentTermsNote = (
+  issueTimestamp: unknown,
+  dueInDays: unknown,
+  language: string | undefined,
+  targetFormat: string,
+): string => {
+  const dueDate = getWritableDueDate(issueTimestamp, dueInDays, targetFormat);
+  const isoDate = dueDate.toISOString().slice(0, 10);
+  const german = (language ?? '').toLowerCase().startsWith('de');
+  const germanDate = `${isoDate.slice(8, 10)}.${isoDate.slice(5, 7)}.${isoDate.slice(0, 4)}`;
+  if (dueInDays === 0) {
+    return german ? 'Zahlbar sofort' : 'Payable immediately';
+  }
+  if ((dueInDays as number) > 0) {
+    return german ? `Zahlbar bis ${germanDate}` : `Payable by ${isoDate}`;
+  }
+  return german ? `Fällig seit dem ${germanDate}` : `Due since ${isoDate}`;
+};

package/ts/formats/validation/integrated.validator.ts

@@ -11,6 +11,7 @@ import { EN16931BusinessRulesValidator } from './en16931.business-rules.validato
 import { CodeListValidator } from './codelist.validator.js';
 import type { ValidationResult, ValidationOptions, ValidationReport } from './validation.types.js';
 import type { EInvoice } from '../../einvoice.js';
+import { UBL_CUSTOMIZATION_IDS } from '../ubl/ubl.types.js';
 
 /**
  * Main validator that combines all validation capabilities
@@ -196,9 +197,11 @@ export class MainValidator {
     const profileId = invoice.metadata?.profileId || '';
     const customizationId = invoice.metadata?.customizationId || '';
     
+    // XRechnung 3.0 (its extension and CVD identifiers begin with it), the identifier
+    // family of XRechnung 1.x and 2.x, and any identifier naming XRechnung
     const xrechnungProfiles = [
-      'urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung',
-      'urn:cen.eu:en16931:2017#conformant#urn:xeinkauf.de:kosit:xrechnung',
+      UBL_CUSTOMIZATION_IDS.XRECHNUNG,
+      'urn:xoev-de:kosit:standard:xrechnung_',
       'xrechnung'
     ];
     

package/ts/formats/validation/xrechnung.validator.ts

@@ -8,6 +8,7 @@
 
 import type { EInvoice } from '../../einvoice.js';
 import type { ValidationResult } from './validation.types.js';
+import { UBL_CUSTOMIZATION_IDS } from '../ubl/ubl.types.js';
 
 /**
  * XRechnung-specific validator implementing German CIUS rules
@@ -62,10 +63,11 @@ export class XRechnungValidator {
     const customizationId = invoice.metadata?.customizationId || '';
     
     // XRechnung profile identifiers
+    // XRechnung 3.0 (its extension and CVD identifiers begin with it), the identifier
+    // family of XRechnung 1.x and 2.x, and any identifier naming XRechnung
     const xrechnungProfiles = [
-      'urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0',
-      'urn:cen.eu:en16931:2017#conformant#urn:xeinkauf.de:kosit:xrechnung_3.0',
-      'urn:cen.eu:en16931:2017:xrechnung',
+      UBL_CUSTOMIZATION_IDS.XRECHNUNG,
+      'urn:xoev-de:kosit:standard:xrechnung_',
       'xrechnung'
     ];