@fin.cx/einvoice 8.0.0 → 8.2.0

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

@@ -8,6 +8,10 @@ import type {
 import { business, finance } from '../../../plugins.js';
 import { UBLDocumentType } from '../ubl.types.js';
 import { EN16931Validator } from '../../validation/en16931.validator.js';
+import {
+  getPrecedingInvoiceFields,
+  type TPrecedingInvoiceReference,
+} from '../../utils/preceding.invoice.js';
 
 /**
  * Decoder for XRechnung (UBL) format
@@ -23,7 +27,7 @@ export class XRechnungDecoder extends UBLBaseDecoder {
   }
 
   /**
-   * Decodes a UBL invoice document: an invoice, a debit note or a self-billed invoice
+   * Decodes a UBL invoice document: an invoice, a corrected invoice, a debit note or a self-billed invoice
    * @param accountingDocType The type the document type code stands for
    * @returns Promise resolving to the invoice document
    */
@@ -83,7 +87,8 @@ export class XRechnungDecoder extends UBLBaseDecoder {
           const buyerItemID = this.getText('./cac:Item/cac:BuyersItemIdentification/cbc:ID', line) || '';
           const standardItemID = this.getText('./cac:Item/cac:StandardItemIdentification/cbc:ID', line) || '';
           const commodityClassification = this.getText('./cac:Item/cac:CommodityClassification/cbc:ItemClassificationCode', line) || '';
-          const unitType = this.getText(`./${quantityElement}/@unitCode`, line) || 'EA';
+          // an absent unit code (BT-130) stays absent, so that BR-23 reports it
+          const unitType = this.getText(`./${quantityElement}/@unitCode`, line);
 
           let unitQuantity = 1;
           const quantityText = this.getText(`./${quantityElement}`, line);
@@ -167,10 +172,11 @@ export class XRechnungDecoder extends UBLBaseDecoder {
       const paymentTermsNote = this.getText('//cac:PaymentTerms/cbc:Note', this.doc);
       const discountPercent = this.getText('//cac:PaymentTerms/cbc:SettlementDiscountPercent', this.doc);
 
-      // Extract period information
-      const periodStart = this.getText('//cac:InvoicePeriod/cbc:StartDate', this.doc);
-      const periodEnd = this.getText('//cac:InvoicePeriod/cbc:EndDate', this.doc);
-      const deliveryDate = this.getText('//cac:Delivery/cbc:ActualDeliveryDate', this.doc);
+      // Extract the document level period (BG-14) and delivery date (BT-72); a line has
+      // an invoice period (BG-26) and a delivery of its own, which are not the document's
+      const periodStart = this.getText('/*/cac:InvoicePeriod/cbc:StartDate', this.doc);
+      const periodEnd = this.getText('/*/cac:InvoicePeriod/cbc:EndDate', this.doc);
+      const deliveryDate = this.getText('/*/cac:Delivery/cbc:ActualDeliveryDate', this.doc);
 
       // Extract notes (excluding PaymentTerms notes)
       const allNotes: string[] = [];
@@ -254,7 +260,18 @@ export class XRechnungDecoder extends UBLBaseDecoder {
         reverseCharge: false,
         currency: currencyCode as finance.TCurrency,
         notes: notes,
-        objectActions: []
+        objectActions: [],
+        // the day and the period of supply as the document states them (BT-72, BG-14)
+        ...(deliveryDate ? { deliveryDate: this.parseRequiredUblDate(deliveryDate) } : {}),
+        ...(periodStart && periodEnd
+          ? {
+              periodOfPerformance: {
+                from: this.parseRequiredUblDate(periodStart),
+                to: this.parseRequiredUblDate(periodEnd),
+              },
+            }
+          : {}),
+        ...getPrecedingInvoiceFields(accountingDocType, this.extractPrecedingInvoiceReferences()),
       };
 
       if (hasBusinessReferences || hasPaymentInformation || hasDateInformation) {
@@ -280,6 +297,29 @@ export class XRechnungDecoder extends UBLBaseDecoder {
     }
   }
 
+  /**
+   * Reads the preceding invoice references (BG-3): the number (BT-25) and,
+   * when stated, the issue date (BT-26) of each.
+   */
+  private extractPrecedingInvoiceReferences(): TPrecedingInvoiceReference[] {
+    const referenceNodes = this.select(
+      './cac:BillingReference/cac:InvoiceDocumentReference',
+      this.doc.documentElement,
+    );
+    const references: TPrecedingInvoiceReference[] = [];
+    for (const referenceNode of Array.isArray(referenceNodes) ? referenceNodes : []) {
+      const documentId = this.getText('./cbc:ID', referenceNode).trim();
+      if (!documentId) {
+        continue;
+      }
+      const issueDate = this.getText('./cbc:IssueDate', referenceNode).trim();
+      references.push(
+        issueDate ? { documentId, issueDate: this.parseRequiredUblDate(issueDate) } : { documentId },
+      );
+    }
+    return references;
+  }
+
   /**
    * Extracts party information from XML
    * @param partyPath XPath to the party element

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

@@ -25,7 +25,7 @@ export class XRechnungEncoder extends UBLEncoder {
   }
   
   /**
-   * Encodes an invoice document (invoice, debit note or self-billed invoice) into XRechnung XML
+   * Encodes an invoice document (invoice, corrected invoice, debit note or self-billed invoice) into XRechnung XML
    * @param invoice Invoice document to encode
    * @returns XRechnung XML string
    */
@@ -114,6 +114,9 @@ export class XRechnungEncoder extends UBLEncoder {
     
     // Enhance line items with metadata
     this.enhanceLineItems(doc, invoice);
+
+    // the customizations above insert where they can; the schema order is restored last
+    this.orderRootElements(doc);
   }
   
   /**

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

@@ -0,0 +1,21 @@
+import { EInvoiceFormatError } from '../../errors.js';
+
+/**
+ * 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
+ * with an `EInvoiceFormatError` naming the field: the encoders never write a
+ * date the document does not state, such as today in place of a missing one.
+ * @param timestamp The timestamp (milliseconds since the epoch) to write
+ * @param field The business term it is written as, for example `BT-2 invoice issue date`
+ * @param targetFormat The format being written
+ */
+export const getWritableDate = (timestamp: unknown, field: string, targetFormat: string): Date => {
+  const date = typeof timestamp === 'number' && Number.isFinite(timestamp) ? new Date(timestamp) : undefined;
+  if (!date || Number.isNaN(date.getTime())) {
+    throw new EInvoiceFormatError(`${field} is no valid date: ${String(timestamp)}`, {
+      targetFormat,
+      unsupportedFeatures: [field],
+    });
+  }
+  return date;
+};

package/ts/formats/utils/document.typecode.ts

@@ -7,6 +7,7 @@ import { EInvoiceFormatError } from '../../errors.js';
  */
 const DOCUMENT_TYPE_CODES: Record<TAccountingDocType, string> = {
   'invoice': '380',
+  'corrected-invoice': '384',
   'creditnote': '381',
   'debitnote': '383',
   'self-billed-invoice': '389',
@@ -42,9 +43,9 @@ export const getDocumentTypeCode = (accountingDocType: TAccountingDocType): stri
 };
 
 /**
- * The accounting document type of a decoded type code. 383 and 389 have a
- * type of their own; the remaining credit note related codes are credit
- * notes; everything else is an invoice, which covers 380, 384 and the other
+ * The accounting document type of a decoded type code. 383, 384 and 389 have
+ * a type of their own; the remaining credit note related codes are credit
+ * notes; everything else is an invoice, which covers 380 and the other
  * invoice related codes (326, 386, 875, ...) the envelope has no name for.
  * A missing or unlisted code stays an invoice as well: the document is an
  * invoice document, and reporting the code is the validators' job (BR-04,
@@ -55,6 +56,9 @@ export const getAccountingDocType = (typeCode: string): TAccountingDocType => {
   if (code === DOCUMENT_TYPE_CODES['debitnote']) {
     return 'debitnote';
   }
+  if (code === DOCUMENT_TYPE_CODES['corrected-invoice']) {
+    return 'corrected-invoice';
+  }
   if (code === DOCUMENT_TYPE_CODES['self-billed-invoice']) {
     return 'self-billed-invoice';
   }

package/ts/formats/utils/preceding.invoice.ts

@@ -0,0 +1,74 @@
+import type {
+  TAccountingDoc,
+  TAccountingDocType,
+  TCorrectedInvoiceReference,
+  TRelatedDocument,
+} from '../../interfaces/common.js';
+
+/**
+ * One preceding invoice reference (BG-3): the number of the preceding invoice
+ * (BT-25) and, when the document states it, its issue date (BT-26).
+ */
+export type TPrecedingInvoiceReference = TCorrectedInvoiceReference;
+
+/**
+ * The preceding invoice references (BG-3) an encoder writes for a document,
+ * taken only from what the document states:
+ * - a corrected invoice: the invoice it corrects (`correctedInvoice`);
+ * - a corrected invoice or a credit note: every related document with the
+ *   relation `'corrects'`.
+ * Other documents and other relations write none.
+ */
+export const getPrecedingInvoiceReferences = (
+  accountingDoc: TAccountingDoc,
+): TPrecedingInvoiceReference[] => {
+  const references: TPrecedingInvoiceReference[] = [];
+  if (accountingDoc.accountingDocType === 'corrected-invoice' && accountingDoc.correctedInvoice) {
+    references.push(accountingDoc.correctedInvoice);
+  }
+  if (
+    accountingDoc.accountingDocType === 'corrected-invoice' ||
+    accountingDoc.accountingDocType === 'creditnote'
+  ) {
+    for (const relatedDocument of accountingDoc.relatedDocuments ?? []) {
+      if (relatedDocument.relationType === 'corrects') {
+        references.push(
+          relatedDocument.issueDate === undefined
+            ? { documentId: relatedDocument.documentId }
+            : { documentId: relatedDocument.documentId, issueDate: relatedDocument.issueDate },
+        );
+      }
+    }
+  }
+  return references;
+};
+
+/**
+ * The envelope fields for the preceding invoice references a decoder read, the
+ * inverse of {@link getPrecedingInvoiceReferences}: on a corrected invoice the
+ * first reference is the invoice it corrects and further ones are related
+ * documents it corrects; on a credit note every reference is a related
+ * document it corrects. Other documents keep no reference, as before.
+ */
+export const getPrecedingInvoiceFields = (
+  accountingDocType: TAccountingDocType,
+  references: TPrecedingInvoiceReference[],
+): { correctedInvoice?: TCorrectedInvoiceReference; relatedDocuments?: TRelatedDocument[] } => {
+  const asRelated = (reference: TPrecedingInvoiceReference): TRelatedDocument => ({
+    relationType: 'corrects',
+    ...reference,
+  });
+  if (references.length === 0) {
+    return {};
+  }
+  if (accountingDocType === 'corrected-invoice') {
+    const [correctedInvoice, ...furtherReferences] = references;
+    return furtherReferences.length === 0
+      ? { correctedInvoice }
+      : { correctedInvoice, relatedDocuments: furtherReferences.map(asRelated) };
+  }
+  if (accountingDocType === 'creditnote') {
+    return { relatedDocuments: references.map(asRelated) };
+  }
+  return {};
+};

package/ts/formats/utils/unit.codes.ts

@@ -0,0 +1,215 @@
+/**
+ * The unit of measure codes EN 16931 admits, as business rule BR-CL-23 lists them: UN/ECE
+ * Recommendation 20 with the Recommendation 21 extension. They apply to the invoiced quantity
+ * unit of measure (BT-130) and the item price base quantity unit of measure (BT-150).
+ *
+ * Source: the EN 16931 validation artefacts of CEN/TC 434, release validation-1.3.16
+ * (https://github.com/ConnectingEurope/eInvoicing-EN16931/releases/tag/validation-1.3.16),
+ * rule BR-CL-23 in ubl/schematron/codelist/EN16931-UBL-codes.sch and
+ * cii/schematron/codelist/EN16931-CII-codes.sch, which carry the same 2162 codes. The codes are
+ * reproduced unaltered and in the order of the rule. The source files are licensed under EUPL-1.2;
+ * the codes are those of UN/ECE Recommendations 20 and 21.
+ */
+
+/** Where the EN 16931 unit code list comes from, and the codes it holds. */
+export interface IEn16931UnitCodeList {
+  /** the business rule that lists the codes */
+  readonly rule: 'BR-CL-23';
+  /** the business terms whose values the rule checks */
+  readonly businessTerms: readonly ['BT-130', 'BT-150'];
+  /** the code lists the codes belong to */
+  readonly codeLists: 'UN/ECE Recommendation 20 with Recommendation 21 extension';
+  /** the release of the EN 16931 validation artefacts the codes are taken from */
+  readonly source: 'EN 16931 validation artefacts (CEN/TC 434) validation-1.3.16';
+  /**
+   * the codes, in the order of the rule; the array is frozen, and the validators check against a
+   * private copy, so nothing a caller does to it changes a check
+   */
+  readonly codes: readonly string[];
+}
+
+const BR_CL_23_CODES: readonly string[] = Object.freeze([
+  '10', '11', '13', '14', '15', '20', '21', '22', '23', '24', '25', '27', '28', '33',
+  '34', '35', '37', '38', '40', '41', '56', '57', '58', '59', '60', '61', '74', '77',
+  '80', '81', '85', '87', '89', '91', '1I', '2A', '2B', '2C', '2G', '2H', '2I', '2J',
+  '2K', '2L', '2M', '2N', '2P', '2Q', '2R', '2U', '2X', '2Y', '2Z', '3B', '3C', '4C',
+  '4G', '4H', '4K', '4L', '4M', '4N', '4O', '4P', '4Q', '4R', '4T', '4U', '4W', '4X',
+  '5A', '5B', '5E', '5J', 'A10', 'A11', 'A12', 'A13', 'A14', 'A15', 'A16', 'A17', 'A18', 'A19',
+  'A2', 'A20', 'A21', 'A22', 'A23', 'A24', 'A26', 'A27', 'A28', 'A29', 'A3', 'A30', 'A31', 'A32',
+  'A33', 'A34', 'A35', 'A36', 'A37', 'A38', 'A39', 'A4', 'A40', 'A41', 'A42', 'A43', 'A44', 'A45',
+  'A47', 'A48', 'A49', 'A5', 'A53', 'A54', 'A55', 'A56', 'A59', 'A6', 'A68', 'A69', 'A7', 'A70',
+  'A71', 'A73', 'A74', 'A75', 'A76', 'A8', 'A84', 'A85', 'A86', 'A87', 'A88', 'A89', 'A9', 'A90',
+  'A91', 'A93', 'A94', 'A95', 'A96', 'A97', 'A98', 'A99', 'AA', 'AB', 'ACR', 'ACT', 'AD', 'AE',
+  'AH', 'AI', 'AK', 'AL', 'AMH', 'AMP', 'ANN', 'APZ', 'AQ', 'AS', 'ASM', 'ASU', 'ATM', 'AWG',
+  'AY', 'AZ', 'B1', 'B10', 'B11', 'B12', 'B13', 'B14', 'B15', 'B16', 'B17', 'B18', 'B19', 'B20',
+  'B21', 'B22', 'B23', 'B24', 'B25', 'B26', 'B27', 'B28', 'B29', 'B3', 'B30', 'B31', 'B32', 'B33',
+  'B34', 'B35', 'B4', 'B41', 'B42', 'B43', 'B44', 'B45', 'B46', 'B47', 'B48', 'B49', 'B50', 'B52',
+  'B53', 'B54', 'B55', 'B56', 'B57', 'B58', 'B59', 'B60', 'B61', 'B62', 'B63', 'B64', 'B66', 'B67',
+  'B68', 'B69', 'B7', 'B70', 'B71', 'B72', 'B73', 'B74', 'B75', 'B76', 'B77', 'B78', 'B79', 'B8',
+  'B80', 'B81', 'B82', 'B83', 'B84', 'B85', 'B86', 'B87', 'B88', 'B89', 'B90', 'B91', 'B92', 'B93',
+  'B94', 'B95', 'B96', 'B97', 'B98', 'B99', 'BAR', 'BB', 'BFT', 'BHP', 'BIL', 'BLD', 'BLL', 'BP',
+  'BPM', 'BQL', 'BTU', 'BUA', 'BUI', 'C0', 'C10', 'C11', 'C12', 'C13', 'C14', 'C15', 'C16', 'C17',
+  'C18', 'C19', 'C20', 'C21', 'C22', 'C23', 'C24', 'C25', 'C26', 'C27', 'C28', 'C29', 'C3', 'C30',
+  'C31', 'C32', 'C33', 'C34', 'C35', 'C36', 'C37', 'C38', 'C39', 'C40', 'C41', 'C42', 'C43', 'C44',
+  'C45', 'C46', 'C47', 'C48', 'C49', 'C50', 'C51', 'C52', 'C53', 'C54', 'C55', 'C56', 'C57', 'C58',
+  'C59', 'C60', 'C61', 'C62', 'C63', 'C64', 'C65', 'C66', 'C67', 'C68', 'C69', 'C7', 'C70', 'C71',
+  'C72', 'C73', 'C74', 'C75', 'C76', 'C78', 'C79', 'C8', 'C80', 'C81', 'C82', 'C83', 'C84', 'C85',
+  'C86', 'C87', 'C88', 'C89', 'C9', 'C90', 'C91', 'C92', 'C93', 'C94', 'C95', 'C96', 'C97', 'C99',
+  'CCT', 'CDL', 'CEL', 'CEN', 'CG', 'CGM', 'CKG', 'CLF', 'CLT', 'CMK', 'CMQ', 'CMT', 'CNP', 'CNT',
+  'COU', 'CTG', 'CTM', 'CTN', 'CUR', 'CWA', 'CWI', 'D03', 'D04', 'D1', 'D10', 'D11', 'D12', 'D13',
+  'D15', 'D16', 'D17', 'D18', 'D19', 'D2', 'D20', 'D21', 'D22', 'D23', 'D24', 'D25', 'D26', 'D27',
+  'D29', 'D30', 'D31', 'D32', 'D33', 'D34', 'D36', 'D41', 'D42', 'D43', 'D44', 'D45', 'D46', 'D47',
+  'D48', 'D49', 'D5', 'D50', 'D51', 'D52', 'D53', 'D54', 'D55', 'D56', 'D57', 'D58', 'D59', 'D6',
+  'D60', 'D61', 'D62', 'D63', 'D65', 'D68', 'D69', 'D73', 'D74', 'D77', 'D78', 'D80', 'D81', 'D82',
+  'D83', 'D85', 'D86', 'D87', 'D88', 'D89', 'D91', 'D93', 'D94', 'D95', 'DAA', 'DAD', 'DAY', 'DB',
+  'DBM', 'DBW', 'DD', 'DEC', 'DG', 'DJ', 'DLT', 'DMA', 'DMK', 'DMO', 'DMQ', 'DMT', 'DN', 'DPC',
+  'DPR', 'DPT', 'DRA', 'DRI', 'DRL', 'DT', 'DTN', 'DWT', 'DZN', 'DZP', 'E01', 'E07', 'E08', 'E09',
+  'E10', 'E12', 'E14', 'E15', 'E16', 'E17', 'E18', 'E19', 'E20', 'E21', 'E22', 'E23', 'E25', 'E27',
+  'E28', 'E30', 'E31', 'E32', 'E33', 'E34', 'E35', 'E36', 'E37', 'E38', 'E39', 'E4', 'E40', 'E41',
+  'E42', 'E43', 'E44', 'E45', 'E46', 'E47', 'E48', 'E49', 'E50', 'E51', 'E52', 'E53', 'E54', 'E55',
+  'E56', 'E57', 'E58', 'E59', 'E60', 'E61', 'E62', 'E63', 'E64', 'E65', 'E66', 'E67', 'E68', 'E69',
+  'E70', 'E71', 'E72', 'E73', 'E74', 'E75', 'E76', 'E77', 'E78', 'E79', 'E80', 'E81', 'E82', 'E83',
+  'E84', 'E85', 'E86', 'E87', 'E88', 'E89', 'E90', 'E91', 'E92', 'E93', 'E94', 'E95', 'E96', 'E97',
+  'E98', 'E99', 'EA', 'EB', 'EQ', 'F01', 'F02', 'F03', 'F04', 'F05', 'F06', 'F07', 'F08', 'F10',
+  'F11', 'F12', 'F13', 'F14', 'F15', 'F16', 'F17', 'F18', 'F19', 'F20', 'F21', 'F22', 'F23', 'F24',
+  'F25', 'F26', 'F27', 'F28', 'F29', 'F30', 'F31', 'F32', 'F33', 'F34', 'F35', 'F36', 'F37', 'F38',
+  'F39', 'F40', 'F41', 'F42', 'F43', 'F44', 'F45', 'F46', 'F47', 'F48', 'F49', 'F50', 'F51', 'F52',
+  'F53', 'F54', 'F55', 'F56', 'F57', 'F58', 'F59', 'F60', 'F61', 'F62', 'F63', 'F64', 'F65', 'F66',
+  'F67', 'F68', 'F69', 'F70', 'F71', 'F72', 'F73', 'F74', 'F75', 'F76', 'F77', 'F78', 'F79', 'F80',
+  'F81', 'F82', 'F83', 'F84', 'F85', 'F86', 'F87', 'F88', 'F89', 'F90', 'F91', 'F92', 'F93', 'F94',
+  'F95', 'F96', 'F97', 'F98', 'F99', 'FAH', 'FAR', 'FBM', 'FC', 'FF', 'FH', 'FIT', 'FL', 'FNU',
+  'FOT', 'FP', 'FR', 'FS', 'FTK', 'FTQ', 'G01', 'G04', 'G05', 'G06', 'G08', 'G09', 'G10', 'G11',
+  'G12', 'G13', 'G14', 'G15', 'G16', 'G17', 'G18', 'G19', 'G2', 'G20', 'G21', 'G23', 'G24', 'G25',
+  'G26', 'G27', 'G28', 'G29', 'G3', 'G30', 'G31', 'G32', 'G33', 'G34', 'G35', 'G36', 'G37', 'G38',
+  'G39', 'G40', 'G41', 'G42', 'G43', 'G44', 'G45', 'G46', 'G47', 'G48', 'G49', 'G50', 'G51', 'G52',
+  'G53', 'G54', 'G55', 'G56', 'G57', 'G58', 'G59', 'G60', 'G61', 'G62', 'G63', 'G64', 'G65', 'G66',
+  'G67', 'G68', 'G69', 'G70', 'G71', 'G72', 'G73', 'G74', 'G75', 'G76', 'G77', 'G78', 'G79', 'G80',
+  'G81', 'G82', 'G83', 'G84', 'G85', 'G86', 'G87', 'G88', 'G89', 'G90', 'G91', 'G92', 'G93', 'G94',
+  'G95', 'G96', 'G97', 'G98', 'G99', 'GB', 'GBQ', 'GDW', 'GE', 'GF', 'GFI', 'GGR', 'GIA', 'GIC',
+  'GII', 'GIP', 'GJ', 'GL', 'GLD', 'GLI', 'GLL', 'GM', 'GO', 'GP', 'GQ', 'GRM', 'GRN', 'GRO',
+  'GV', 'GWH', 'H03', 'H04', 'H05', 'H06', 'H07', 'H08', 'H09', 'H10', 'H11', 'H12', 'H13', 'H14',
+  'H15', 'H16', 'H18', 'H19', 'H20', 'H21', 'H22', 'H23', 'H24', 'H25', 'H26', 'H27', 'H28', 'H29',
+  'H30', 'H31', 'H32', 'H33', 'H34', 'H35', 'H36', 'H37', 'H38', 'H39', 'H40', 'H41', 'H42', 'H43',
+  'H44', 'H45', 'H46', 'H47', 'H48', 'H49', 'H50', 'H51', 'H52', 'H53', 'H54', 'H55', 'H56', 'H57',
+  'H58', 'H59', 'H60', 'H61', 'H62', 'H63', 'H64', 'H65', 'H66', 'H67', 'H68', 'H69', 'H70', 'H71',
+  'H72', 'H73', 'H74', 'H75', 'H76', 'H77', 'H79', 'H80', 'H81', 'H82', 'H83', 'H84', 'H85', 'H87',
+  'H88', 'H89', 'H90', 'H91', 'H92', 'H93', 'H94', 'H95', 'H96', 'H98', 'H99', 'HA', 'HAD', 'HBA',
+  'HBX', 'HC', 'HDW', 'HEA', 'HGM', 'HH', 'HIU', 'HKM', 'HLT', 'HM', 'HMO', 'HMQ', 'HMT', 'HPA',
+  'HTZ', 'HUR', 'HWE', 'IA', 'IE', 'INH', 'INK', 'INQ', 'ISD', 'IU', 'IUG', 'IV', 'J10', 'J12',
+  'J13', 'J14', 'J15', 'J16', 'J17', 'J18', 'J19', 'J2', 'J20', 'J21', 'J22', 'J23', 'J24', 'J25',
+  'J26', 'J27', 'J28', 'J29', 'J30', 'J31', 'J32', 'J33', 'J34', 'J35', 'J36', 'J38', 'J39', 'J40',
+  'J41', 'J42', 'J43', 'J44', 'J45', 'J46', 'J47', 'J48', 'J49', 'J50', 'J51', 'J52', 'J53', 'J54',
+  'J55', 'J56', 'J57', 'J58', 'J59', 'J60', 'J61', 'J62', 'J63', 'J64', 'J65', 'J66', 'J67', 'J68',
+  'J69', 'J70', 'J71', 'J72', 'J73', 'J74', 'J75', 'J76', 'J78', 'J79', 'J81', 'J82', 'J83', 'J84',
+  'J85', 'J87', 'J90', 'J91', 'J92', 'J93', 'J95', 'J96', 'J97', 'J98', 'J99', 'JE', 'JK', 'JM',
+  'JNT', 'JOU', 'JPS', 'JWL', 'K1', 'K10', 'K11', 'K12', 'K13', 'K14', 'K15', 'K16', 'K17', 'K18',
+  'K19', 'K2', 'K20', 'K21', 'K22', 'K23', 'K26', 'K27', 'K28', 'K3', 'K30', 'K31', 'K32', 'K33',
+  'K34', 'K35', 'K36', 'K37', 'K38', 'K39', 'K40', 'K41', 'K42', 'K43', 'K45', 'K46', 'K47', 'K48',
+  'K49', 'K50', 'K51', 'K52', 'K53', 'K54', 'K55', 'K58', 'K59', 'K6', 'K60', 'K61', 'K62', 'K63',
+  'K64', 'K65', 'K66', 'K67', 'K68', 'K69', 'K70', 'K71', 'K73', 'K74', 'K75', 'K76', 'K77', 'K78',
+  'K79', 'K80', 'K81', 'K82', 'K83', 'K84', 'K85', 'K86', 'K87', 'K88', 'K89', 'K90', 'K91', 'K92',
+  'K93', 'K94', 'K95', 'K96', 'K97', 'K98', 'K99', 'KA', 'KAT', 'KB', 'KBA', 'KCC', 'KDW', 'KEL',
+  'KGM', 'KGS', 'KHY', 'KHZ', 'KI', 'KIC', 'KIP', 'KJ', 'KJO', 'KL', 'KLK', 'KLX', 'KMA', 'KMH',
+  'KMK', 'KMQ', 'KMT', 'KNI', 'KNM', 'KNS', 'KNT', 'KO', 'KPA', 'KPH', 'KPO', 'KPP', 'KR', 'KSD',
+  'KSH', 'KT', 'KTN', 'KUR', 'KVA', 'KVR', 'KVT', 'KW', 'KWH', 'KWN', 'KWO', 'KWS', 'KWT', 'KWY',
+  'KX', 'L10', 'L11', 'L12', 'L13', 'L14', 'L15', 'L16', 'L17', 'L18', 'L19', 'L2', 'L20', 'L21',
+  'L23', 'L24', 'L25', 'L26', 'L27', 'L28', 'L29', 'L30', 'L31', 'L32', 'L33', 'L34', 'L35', 'L36',
+  'L37', 'L38', 'L39', 'L40', 'L41', 'L42', 'L43', 'L44', 'L45', 'L46', 'L47', 'L48', 'L49', 'L50',
+  'L51', 'L52', 'L53', 'L54', 'L55', 'L56', 'L57', 'L58', 'L59', 'L60', 'L63', 'L64', 'L65', 'L66',
+  'L67', 'L68', 'L69', 'L70', 'L71', 'L72', 'L73', 'L74', 'L75', 'L76', 'L77', 'L78', 'L79', 'L80',
+  'L81', 'L82', 'L83', 'L84', 'L85', 'L86', 'L87', 'L88', 'L89', 'L90', 'L91', 'L92', 'L93', 'L94',
+  'L95', 'L96', 'L98', 'L99', 'LA', 'LAC', 'LBR', 'LBT', 'LD', 'LEF', 'LF', 'LH', 'LK', 'LM',
+  'LN', 'LO', 'LP', 'LPA', 'LR', 'LS', 'LTN', 'LTR', 'LUB', 'LUM', 'LUX', 'LY', 'M1', 'M10',
+  'M11', 'M12', 'M13', 'M14', 'M15', 'M16', 'M17', 'M18', 'M19', 'M20', 'M21', 'M22', 'M23', 'M24',
+  'M25', 'M26', 'M27', 'M29', 'M30', 'M31', 'M32', 'M33', 'M34', 'M35', 'M36', 'M37', 'M38', 'M39',
+  'M4', 'M40', 'M41', 'M42', 'M43', 'M44', 'M45', 'M46', 'M47', 'M48', 'M49', 'M5', 'M50', 'M51',
+  'M52', 'M53', 'M55', 'M56', 'M57', 'M58', 'M59', 'M60', 'M61', 'M62', 'M63', 'M64', 'M65', 'M66',
+  'M67', 'M68', 'M69', 'M7', 'M70', 'M71', 'M72', 'M73', 'M74', 'M75', 'M76', 'M77', 'M78', 'M79',
+  'M80', 'M81', 'M82', 'M83', 'M84', 'M85', 'M86', 'M87', 'M88', 'M89', 'M9', 'M90', 'M91', 'M92',
+  'M93', 'M94', 'M95', 'M96', 'M97', 'M98', 'M99', 'MAH', 'MAL', 'MAM', 'MAR', 'MAW', 'MBE', 'MBF',
+  'MBR', 'MC', 'MCU', 'MD', 'MGM', 'MHZ', 'MIK', 'MIL', 'MIN', 'MIO', 'MIU', 'MKD', 'MKM', 'MKW',
+  'MLD', 'MLT', 'MMK', 'MMQ', 'MMT', 'MND', 'MNJ', 'MON', 'MPA', 'MQD', 'MQH', 'MQM', 'MQS', 'MQW',
+  'MRD', 'MRM', 'MRW', 'MSK', 'MTK', 'MTQ', 'MTR', 'MTS', 'MTZ', 'MVA', 'MWH', 'N1', 'N10', 'N11',
+  'N12', 'N13', 'N14', 'N15', 'N16', 'N17', 'N18', 'N19', 'N20', 'N21', 'N22', 'N23', 'N24', 'N25',
+  'N26', 'N27', 'N28', 'N29', 'N3', 'N30', 'N31', 'N32', 'N33', 'N34', 'N35', 'N36', 'N37', 'N38',
+  'N39', 'N40', 'N41', 'N42', 'N43', 'N44', 'N45', 'N46', 'N47', 'N48', 'N49', 'N50', 'N51', 'N52',
+  'N53', 'N54', 'N55', 'N56', 'N57', 'N58', 'N59', 'N60', 'N61', 'N62', 'N63', 'N64', 'N65', 'N66',
+  'N67', 'N68', 'N69', 'N70', 'N71', 'N72', 'N73', 'N74', 'N75', 'N76', 'N77', 'N78', 'N79', 'N80',
+  'N81', 'N82', 'N83', 'N84', 'N85', 'N86', 'N87', 'N88', 'N89', 'N90', 'N91', 'N92', 'N93', 'N94',
+  'N95', 'N96', 'N97', 'N98', 'N99', 'NA', 'NAR', 'NCL', 'NEW', 'NF', 'NIL', 'NIU', 'NL', 'NM3',
+  'NMI', 'NMP', 'NPT', 'NT', 'NTU', 'NU', 'NX', 'OA', 'ODE', 'ODG', 'ODK', 'ODM', 'OHM', 'ON',
+  'ONZ', 'OPM', 'OT', 'OZA', 'OZI', 'P1', 'P10', 'P11', 'P12', 'P13', 'P14', 'P15', 'P16', 'P17',
+  'P18', 'P19', 'P2', 'P20', 'P21', 'P22', 'P23', 'P24', 'P25', 'P26', 'P27', 'P28', 'P29', 'P30',
+  'P31', 'P32', 'P33', 'P34', 'P35', 'P36', 'P37', 'P38', 'P39', 'P40', 'P41', 'P42', 'P43', 'P44',
+  'P45', 'P46', 'P47', 'P48', 'P49', 'P5', 'P50', 'P51', 'P52', 'P53', 'P54', 'P55', 'P56', 'P57',
+  'P58', 'P59', 'P60', 'P61', 'P62', 'P63', 'P64', 'P65', 'P66', 'P67', 'P68', 'P69', 'P70', 'P71',
+  'P72', 'P73', 'P74', 'P75', 'P76', 'P77', 'P78', 'P79', 'P80', 'P81', 'P82', 'P83', 'P84', 'P85',
+  'P86', 'P87', 'P88', 'P89', 'P90', 'P91', 'P92', 'P93', 'P94', 'P95', 'P96', 'P97', 'P98', 'P99',
+  'PAL', 'PD', 'PFL', 'PGL', 'PI', 'PLA', 'PO', 'PQ', 'PR', 'PS', 'PTD', 'PTI', 'PTL', 'PTN',
+  'Q10', 'Q11', 'Q12', 'Q13', 'Q14', 'Q15', 'Q16', 'Q17', 'Q18', 'Q19', 'Q20', 'Q21', 'Q22', 'Q23',
+  'Q24', 'Q25', 'Q26', 'Q27', 'Q28', 'Q29', 'Q3', 'Q30', 'Q31', 'Q32', 'Q33', 'Q34', 'Q35', 'Q36',
+  'Q37', 'Q38', 'Q39', 'Q40', 'Q41', 'Q42', 'QA', 'QAN', 'QB', 'QR', 'QTD', 'QTI', 'QTL', 'QTR',
+  'R1', 'R9', 'RH', 'RM', 'ROM', 'RP', 'RPM', 'RPS', 'RT', 'S3', 'S4', 'SAN', 'SCO', 'SCR',
+  'SEC', 'SET', 'SG', 'SIE', 'SM3', 'SMI', 'SQ', 'SQR', 'SR', 'STC', 'STI', 'STK', 'STL', 'STN',
+  'STW', 'SW', 'SX', 'SYR', 'T0', 'T3', 'TAH', 'TAN', 'TI', 'TIC', 'TIP', 'TKM', 'TMS', 'TNE',
+  'TP', 'TPI', 'TPR', 'TQD', 'TRL', 'TST', 'TTS', 'U1', 'U2', 'UB', 'UC', 'VA', 'VLT', 'VP',
+  'W2', 'WA', 'WB', 'WCD', 'WE', 'WEB', 'WEE', 'WG', 'WHR', 'WM', 'WSD', 'WTT', 'X1', 'YDK',
+  'YDQ', 'YRD', 'Z11', 'Z9', 'ZP', 'ZZ', 'X1A', 'X1B', 'X1D', 'X1F', 'X1G', 'X1W', 'X2C', 'X3A',
+  'X3H', 'X43', 'X44', 'X4A', 'X4B', 'X4C', 'X4D', 'X4F', 'X4G', 'X4H', 'X5H', 'X5L', 'X5M', 'X6H',
+  'X6P', 'X7A', 'X7B', 'X8A', 'X8B', 'X8C', 'XAA', 'XAB', 'XAC', 'XAD', 'XAE', 'XAF', 'XAG', 'XAH',
+  'XAI', 'XAJ', 'XAL', 'XAM', 'XAP', 'XAT', 'XAV', 'XB4', 'XBA', 'XBB', 'XBC', 'XBD', 'XBE', 'XBF',
+  'XBG', 'XBH', 'XBI', 'XBJ', 'XBK', 'XBL', 'XBM', 'XBN', 'XBO', 'XBP', 'XBQ', 'XBR', 'XBS', 'XBT',
+  'XBU', 'XBV', 'XBW', 'XBX', 'XBY', 'XBZ', 'XCA', 'XCB', 'XCC', 'XCD', 'XCE', 'XCF', 'XCG', 'XCH',
+  'XCI', 'XCJ', 'XCK', 'XCL', 'XCM', 'XCN', 'XCO', 'XCP', 'XCQ', 'XCR', 'XCS', 'XCT', 'XCU', 'XCV',
+  'XCW', 'XCX', 'XCY', 'XCZ', 'XDA', 'XDB', 'XDC', 'XDG', 'XDH', 'XDI', 'XDJ', 'XDK', 'XDL', 'XDM',
+  'XDN', 'XDP', 'XDR', 'XDS', 'XDT', 'XDU', 'XDV', 'XDW', 'XDX', 'XDY', 'XEC', 'XED', 'XEE', 'XEF',
+  'XEG', 'XEH', 'XEI', 'XEN', 'XFB', 'XFC', 'XFD', 'XFE', 'XFI', 'XFL', 'XFO', 'XFP', 'XFR', 'XFT',
+  'XFW', 'XFX', 'XGB', 'XGI', 'XGL', 'XGR', 'XGU', 'XGY', 'XGZ', 'XHA', 'XHB', 'XHC', 'XHG', 'XHN',
+  'XHR', 'XIA', 'XIB', 'XIC', 'XID', 'XIE', 'XIF', 'XIG', 'XIH', 'XIK', 'XIL', 'XIN', 'XIZ', 'XJB',
+  'XJC', 'XJG', 'XJR', 'XJT', 'XJY', 'XKG', 'XKI', 'XLE', 'XLG', 'XLT', 'XLU', 'XLV', 'XLZ', 'XMA',
+  'XMB', 'XMC', 'XME', 'XMR', 'XMS', 'XMT', 'XMW', 'XMX', 'XNA', 'XNE', 'XNF', 'XNG', 'XNS', 'XNT',
+  'XNU', 'XNV', 'XO1', 'XO2', 'XO3', 'XO4', 'XO5', 'XO6', 'XO7', 'XO8', 'XO9', 'XOA', 'XOB', 'XOC',
+  'XOD', 'XOE', 'XOF', 'XOG', 'XOH', 'XOI', 'XOJ', 'XOK', 'XOL', 'XOM', 'XON', 'XOP', 'XOQ', 'XOR',
+  'XOS', 'XOT', 'XOU', 'XOV', 'XOW', 'XOX', 'XOY', 'XOZ', 'XP1', 'XP2', 'XP3', 'XP4', 'XPA', 'XPB',
+  'XPC', 'XPD', 'XPE', 'XPF', 'XPG', 'XPH', 'XPI', 'XPJ', 'XPK', 'XPL', 'XPN', 'XPO', 'XPP', 'XPR',
+  'XPT', 'XPU', 'XPV', 'XPX', 'XPY', 'XPZ', 'XQA', 'XQB', 'XQC', 'XQD', 'XQF', 'XQG', 'XQH', 'XQJ',
+  'XQK', 'XQL', 'XQM', 'XQN', 'XQP', 'XQQ', 'XQR', 'XQS', 'XRD', 'XRG', 'XRJ', 'XRK', 'XRL', 'XRO',
+  'XRT', 'XRZ', 'XSA', 'XSB', 'XSC', 'XSD', 'XSE', 'XSH', 'XSI', 'XSK', 'XSL', 'XSM', 'XSO', 'XSP',
+  'XSS', 'XST', 'XSU', 'XSV', 'XSW', 'XSX', 'XSY', 'XSZ', 'XT1', 'XTB', 'XTC', 'XTD', 'XTE', 'XTG',
+  'XTI', 'XTK', 'XTL', 'XTN', 'XTO', 'XTR', 'XTS', 'XTT', 'XTU', 'XTV', 'XTW', 'XTY', 'XTZ', 'XUC',
+  'XUN', 'XVA', 'XVG', 'XVI', 'XVK', 'XVL', 'XVN', 'XVO', 'XVP', 'XVQ', 'XVR', 'XVS', 'XVY', 'XWA',
+  'XWB', 'XWC', 'XWD', 'XWF', 'XWG', 'XWH', 'XWJ', 'XWK', 'XWL', 'XWM', 'XWN', 'XWP', 'XWQ', 'XWR',
+  'XWS', 'XWT', 'XWU', 'XWV', 'XWW', 'XWX', 'XWY', 'XWZ', 'XXA', 'XXB', 'XXC', 'XXD', 'XXF', 'XXG',
+  'XXH', 'XXJ', 'XXK', 'XYA', 'XYB', 'XYC', 'XYD', 'XYF', 'XYG', 'XYH', 'XYJ', 'XYK', 'XYL', 'XYM',
+  'XYN', 'XYP', 'XYQ', 'XYR', 'XYS', 'XYT', 'XYV', 'XYW', 'XYX', 'XYY', 'XYZ', 'XZA', 'XZB', 'XZC',
+  'XZD', 'XZF', 'XZG', 'XZH', 'XZJ', 'XZK', 'XZL', 'XZM', 'XZN', 'XZP', 'XZQ', 'XZR', 'XZS', 'XZT',
+  'XZU', 'XZV', 'XZW', 'XZX', 'XZY', 'XZZ',
+]);
+
+/** the set every check uses; it never leaves this module */
+const unitCodes: ReadonlySet<string> = new Set(BR_CL_23_CODES);
+
+/** The EN 16931 unit code list (BR-CL-23) with its source. */
+export const en16931UnitCodeList: IEn16931UnitCodeList = Object.freeze({
+  rule: 'BR-CL-23',
+  businessTerms: Object.freeze(['BT-130', 'BT-150'] as const),
+  codeLists: 'UN/ECE Recommendation 20 with Recommendation 21 extension',
+  source: 'EN 16931 validation artefacts (CEN/TC 434) validation-1.3.16',
+  codes: BR_CL_23_CODES,
+});
+
+/**
+ * Whether a value is a unit code EN 16931 admits (BR-CL-23). The comparison is exact: `HUR` is
+ * a code, `hur`, `HOURS` and ` HUR` are not.
+ */
+export const isEn16931UnitCode = (value: unknown): value is string =>
+  typeof value === 'string' && unitCodes.has(value);
+
+/**
+ * BR-CL-23 as the official rule tests a `unitCode` attribute: XML whitespace around the value is
+ * ignored, and a value with whitespace inside it, or an empty value, fails.
+ */
+export const meetsUnitCodeRule = (attributeValue: string): boolean => {
+  const normalized = attributeValue.replace(/[ \t\r\n]+/g, ' ').replace(/^ | $/g, '');
+  return !normalized.includes(' ') && unitCodes.has(normalized);
+};

package/ts/formats/validation/codelist.validator.ts

@@ -4,6 +4,7 @@ import type { TAccountingDocItem } from '@tsclass/tsclass/dist_ts/finance/index.
 import type { EInvoice } from '../../einvoice.js';
 import type { IExtendedAccountingDocItem } from '../../interfaces/en16931-metadata.js';
 import { getDocumentTypeCode, isAccountingDocType } from '../utils/document.typecode.js';
+import { en16931UnitCodeList, meetsUnitCodeRule } from '../utils/unit.codes.js';
 
 /**
  * Code List Validator for EN16931 compliance
@@ -208,33 +209,21 @@ export class CodeListValidator {
   }
   
   /**
-   * Validate unit codes (UNECE Rec 20)
+   * Validate unit codes (BR-CL-23: UN/ECE Rec 20 with the Rec 21 extension)
    */
   private validateUnitCodes(invoice: EInvoice): void {
     invoice.items?.forEach((item, index) => {
       const unitCode = item.unitType;
-      if (unitCode && !CodeLists.UNECERec20.codes.has(unitCode)) {
+      // an empty unit is an absent one, which BR-23 reports; BR-CL-23 checks a unit that is there
+      if (unitCode && !meetsUnitCodeRule(unitCode)) {
         this.addError(
           'BR-CL-23',
-          `Invalid unit code: ${unitCode}. Must be UNECE Rec 20`,
+          `Invalid unit code: ${unitCode}. Must be UN/ECE Recommendation 20 with Rec 21 extension`,
           'EN16931',
-          `items[${index}].unitCode`,
+          `items[${index}].unitType`,
           'BT-130',
           unitCode,
-          'Common codes: C62 (one), KGM (kilogram), HUR (hour), DAY (day), MTR (metre)'
-        );
-      }
-      
-      // Validate quantity is positive for standard units
-      if (unitCode && item.unitQuantity <= 0 && unitCode !== 'LS') { // LS = Lump sum can be 1
-        this.addError(
-          'BR-25',
-          `Quantity must be positive for unit ${unitCode}`,
-          'EN16931',
-          `items[${index}].quantity`,
-          'BT-129',
-          item.unitQuantity,
-          '> 0'
+          'A code of the EN 16931 unit code list, for example C62 (one), H87 (piece), HUR (hour), DAY (day), MON (month), LS (lump sum)'
         );
       }
     });
@@ -310,7 +299,7 @@ export class CodeListValidator {
       return { name: 'UNCL4461', version: CodeLists.UNCL4461.version };
     }
     if (ruleId.includes('CL-23')) {
-      return { name: 'UNECERec20', version: CodeLists.UNECERec20.version };
+      return { name: en16931UnitCodeList.codeLists, version: en16931UnitCodeList.source };
     }
     return undefined;
   }

package/ts/formats/validation/en16931.business-rules.validator.ts

@@ -381,56 +381,56 @@ export class EN16931BusinessRulesValidator {
         );
       }
       
-      // BR-22: Each Invoice line shall have an Item name
+      // BR-25: Each Invoice line shall contain the Item name
       if (!item.name) {
         this.addError(
-          'BR-22',
+          'BR-25',
           `Invoice line ${index + 1} must have an item name`,
           `items[${index}].name`
         );
       }
       
-      // BR-23: An Invoice line shall have an Invoiced quantity
+      // BR-22: Each Invoice line shall have an Invoiced quantity
       if (item.unitQuantity === undefined || item.unitQuantity === null) {
         this.addError(
-          'BR-23',
+          'BR-22',
           `Invoice line ${index + 1} must have a quantity`,
           `items[${index}].quantity`
         );
       }
       
-      // BR-24: An Invoice line shall have an Invoiced quantity unit of measure code
+      // BR-23: An Invoice line shall have an Invoiced quantity unit of measure code
       if (!item.unitType) {
         this.addError(
-          'BR-24',
+          'BR-23',
           `Invoice line ${index + 1} must have a unit of measure code`,
-          `items[${index}].unitCode`
+          `items[${index}].unitType`
         );
       }
       
-      // BR-25: An Invoice line shall have an Invoice line net amount
+      // BR-24: Each Invoice line shall have an Invoice line net amount
       const lineNetAmount = item.unitNetPrice * item.unitQuantity;
       if (isNaN(lineNetAmount)) {
         this.addError(
-          'BR-25',
+          'BR-24',
           `Invoice line ${index + 1} must have a valid net amount`,
           `items[${index}]`
         );
       }
       
-      // BR-26: Each Invoice line shall have an Invoice line VAT category code
+      // BR-CO-04: Each Invoice line shall be categorized with an Invoiced item VAT category code
       if (item.vatPercentage === undefined) {
         this.addError(
-          'BR-26',
+          'BR-CO-04',
           `Invoice line ${index + 1} must have a VAT category code`,
           `items[${index}].vatPercentage`
         );
       }
       
-      // BR-27: Invoice line net price shall be present
+      // BR-26: Each Invoice line shall contain the Item net price
       if (item.unitNetPrice === undefined || item.unitNetPrice === null) {
         this.addError(
-          'BR-27',
+          'BR-26',
           `Invoice line ${index + 1} must have a net price`,
           `items[${index}].unitPrice`
         );