@fin.cx/einvoice 7.1.0 → 8.1.0

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

@@ -1,5 +1,10 @@
 import { CIIBaseDecoder } from '../cii.decoder.js';
-import type { TInvoice, TCreditNote, TDebitNote } from '../../../interfaces/common.js';
+import type {
+  TAccountingDocEnvelope,
+  TAccountingDocType,
+  TCreditNote,
+  TInvoiceDocument,
+} from '../../../interfaces/common.js';
 import { ZUGFERD_V1_NAMESPACES } from '../cii.types.js';
 import { business, finance } from '../../../plugins.js';
 import { EN16931Validator } from '../../validation/en16931.validator.js';
@@ -28,36 +33,28 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
    * @returns Promise resolving to a TCreditNote object
    */
   protected async decodeCreditNote(): Promise<TCreditNote> {
-    // Get common invoice data
-    const commonData = await this.extractCommonData();
-
-    // Create a credit note with the common data
-    return {
-      ...commonData,
-      accountingDocType: 'creditnote' as const
-    } as unknown as TCreditNote;
+    return this.extractCommonData('creditnote');
   }
 
   /**
-   * Decodes a ZUGFeRD v1 debit note (invoice)
-   * @returns Promise resolving to a TDebitNote object
+   * Decodes a ZUGFeRD v1 invoice document: an 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
    */
-  protected async decodeDebitNote(): Promise<TDebitNote> {
-    // Get common invoice data
-    const commonData = await this.extractCommonData();
-
-    // Create a debit note with the common data
-    return {
-      ...commonData,
-      accountingDocType: 'debitnote' as const
-    } as unknown as TDebitNote;
+  protected async decodeInvoice(
+    accountingDocType: TInvoiceDocument['accountingDocType'],
+  ): Promise<TInvoiceDocument> {
+    return this.extractCommonData(accountingDocType);
   }
 
   /**
    * Extracts common invoice data from ZUGFeRD v1 XML
+   * @param accountingDocType The type the document is decoded as
    * @returns Common invoice data
    */
-  private async extractCommonData(): Promise<Partial<TInvoice>> {
+  private async extractCommonData<TYPE extends TAccountingDocType>(
+    accountingDocType: TYPE,
+  ): Promise<TAccountingDocEnvelope<TYPE, {}>> {
     // Extract invoice ID
     const invoiceId = this.getText('//ram:ID');
 
@@ -108,10 +105,12 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
     // Create the common invoice data
     const invoiceData = {
       type: 'accounting-doc' as const,
-      accountingDocType: 'invoice' as const,
+      accountingDocType,
       id: invoiceId,
       accountingDocId: invoiceId,
       date: issueDate,
+      // a document read from XML has been issued; the envelope carries that as the document and the accounting status
+      status: 'issued',
       accountingDocStatus: 'issued' as const,
       versionInfo: {
         type: 'final' as const,
@@ -207,7 +206,8 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
         const name = this.getText('ram:SpecifiedTradeProduct/ram:Name', itemNode);
         const articleNumber = this.getText('ram:SpecifiedTradeProduct/ram:SellerAssignedID', itemNode);
         const unitQuantity = this.getNumber('ram:SpecifiedLineTradeDelivery/ram:BilledQuantity', itemNode);
-        const unitType = this.getText('ram:SpecifiedLineTradeDelivery/ram:BilledQuantity/@unitCode', itemNode) || 'EA';
+        // an absent unit code (BT-130) stays absent, so that BR-23 reports it
+        const unitType = this.getText('ram:SpecifiedLineTradeDelivery/ram:BilledQuantity/@unitCode', itemNode);
         const unitNetPrice = this.getNumber('ram:SpecifiedLineTradeAgreement/ram:NetPriceProductTradePrice/ram:ChargeAmount', itemNode);
         const vatPercentage = this.getNumber('ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax/ram:RateApplicablePercent', itemNode);
 

package/ts/formats/cii/zugferd/zugferd.validator.ts

@@ -24,8 +24,9 @@ export class ZUGFeRDValidator extends CIIBaseValidator {
    * @returns True if business validation passed
    */
   protected validateBusinessRules(): boolean {
-    // Implement ZUGFeRD-specific business rules
-    // For now, we'll just use the base CII validation
-    return true;
+    // BR-23: every line has a unit code
+    const linesHaveUnits = this.validateLineUnitCodePresence();
+    // BR-CL-23: unit codes of UN/ECE Recommendation 20 with the Recommendation 21 extension
+    return this.validateUnitCodes() && linesHaveUnits;
   }
 }

package/ts/formats/converters/xml-to-einvoice.converter.ts

@@ -100,7 +100,8 @@ export class XMLToEInvoiceConverter {
             position: i,
             name: this.getElementTextFromNode(line, 'cbc:Name') || `Item ${i + 1}`,
             unitQuantity: parseFloat(this.getElementTextFromNode(line, 'cbc:InvoicedQuantity') || '1'),
-            unitType: 'C62',
+            // the unit code (BT-130) the document states, or none, which BR-23 reports
+            unitType: this.getAttributeFromNode(line, 'cbc:InvoicedQuantity', 'unitCode'),
             unitNetPrice: parseFloat(this.getElementTextFromNode(line, 'cbc:PriceAmount') || '100'),
             vatPercentage: parseFloat(this.getElementTextFromNode(line, 'cbc:Percent') || '19')
           };
@@ -118,6 +119,15 @@ export class XMLToEInvoiceConverter {
     return mockInvoice as unknown as EInvoice;
   }
   
+  /**
+   * Helper to get an attribute of the first matching element below a node, or '' when the element
+   * or the attribute is absent
+   */
+  private getAttributeFromNode(node: Element, tagName: string, attributeName: string): string {
+    const element = node.getElementsByTagName(tagName)[0];
+    return element?.getAttribute(attributeName) ?? '';
+  }
+
   /**
    * Helper to get element text from a node
    */

package/ts/formats/semantic/semantic.adapter.ts

@@ -4,6 +4,7 @@
  */
 
 import { EInvoice } from '../../einvoice.js';
+import { getAccountingDocType, getDocumentTypeCode } from '../utils/document.typecode.js';
 import type { 
   EN16931SemanticModel,
   Seller,
@@ -36,7 +37,7 @@ export class SemanticModelAdapter {
       documentInformation: {
         invoiceNumber: invoice.accountingDocId,
         issueDate: invoice.issueDate,
-        typeCode: this.mapInvoiceType(invoice.accountingDocType),
+        typeCode: getDocumentTypeCode(invoice.accountingDocType),
         currencyCode: invoice.currency,
         notes: invoice.notes ? this.mapNotes(invoice.notes) : undefined
       },
@@ -126,7 +127,7 @@ export class SemanticModelAdapter {
     const invoice = new EInvoice();
     invoice.accountingDocId = model.documentInformation.invoiceNumber;
     invoice.issueDate = model.documentInformation.issueDate;
-    invoice.accountingDocType = this.reverseMapInvoiceType(model.documentInformation.typeCode) as 'invoice';
+    invoice.accountingDocType = getAccountingDocType(model.documentInformation.typeCode);
     invoice.currency = model.documentInformation.currencyCode as any;
     invoice.from = this.reverseMapSeller(model.seller);
     invoice.to = this.reverseMapBuyer(model.buyer);
@@ -231,38 +232,6 @@ export class SemanticModelAdapter {
     return invoice;
   }
   
-  /**
-   * Map invoice type code
-   */
-  private mapInvoiceType(type: string): string {
-    const typeMap: Record<string, string> = {
-      'invoice': '380',
-      'creditNote': '381',
-      'debitNote': '383',
-      'correctedInvoice': '384',
-      'prepaymentInvoice': '386',
-      'selfBilledInvoice': '389',
-      'invoice_380': '380',
-      'credit_note_381': '381'
-    };
-    return typeMap[type] || '380';
-  }
-  
-  /**
-   * Reverse map invoice type code
-   */
-  private reverseMapInvoiceType(code: string): string {
-    const typeMap: Record<string, string> = {
-      '380': 'invoice',
-      '381': 'creditNote',
-      '383': 'debitNote',
-      '384': 'correctedInvoice',
-      '386': 'prepaymentInvoice',
-      '389': 'selfBilledInvoice'
-    };
-    return typeMap[code] || 'invoice';
-  }
-  
   /**
    * Map notes
    */
@@ -473,7 +442,7 @@ export class SemanticModelAdapter {
       identifier: (index + 1).toString(),
       note: (item as any).description || (item as any).text || '',
       invoicedQuantity: item.unitQuantity,
-      invoicedQuantityUnitOfMeasureCode: item.unitType || 'C62',
+      invoicedQuantityUnitOfMeasureCode: item.unitType,
       lineExtensionAmount: item.unitNetPrice * item.unitQuantity,
       purchaseOrderLineReference: (item as any).purchaseOrderLineRef,
       buyerAccountingReference: (item as any).buyerAccountingRef,

package/ts/formats/ubl/en16931.ubl.validator.ts

@@ -148,6 +148,12 @@ export class EN16931UBLValidator extends UBLBaseValidator {
       valid = false;
     }
 
+    // BR-23: every line has a unit code
+    valid = this.validateLineUnitCodePresence() && valid;
+
+    // BR-CL-23: unit codes of UN/ECE Recommendation 20 with the Recommendation 21 extension
+    valid = this.validateUnitCodes() && valid;
+
     // Validate calculation rules if we have the necessary data
     if (this.exists('//cac:LegalMonetaryTotal/cbc:LineExtensionAmount')) {
       valid = this.validateCalculationRules() && valid;

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

@@ -1,7 +1,8 @@
 import { UBLBaseEncoder } from '../ubl.encoder.js';
-import type { TInvoice, TCreditNote, TDebitNote } from '../../../interfaces/common.js';
+import type { TAccountingDoc, TCreditNote, TInvoiceDocument } from '../../../interfaces/common.js';
 import { UBLDocumentType } from '../ubl.types.js';
 import { DOMParser, XMLSerializer } from '../../../plugins.js';
+import { getDocumentTypeCode } from '../../utils/document.typecode.js';
 
 /**
  * UBL Encoder implementation
@@ -19,7 +20,7 @@ export class UBLEncoder extends UBLBaseEncoder {
     const doc = new DOMParser().parseFromString(xmlString, 'application/xml');
     
     // Add common document elements
-    this.addCommonElements(doc, creditNote as unknown as TInvoice, UBLDocumentType.CREDIT_NOTE);
+    this.addCommonElements(doc, creditNote, UBLDocumentType.CREDIT_NOTE);
     
     // Add credit note specific data
     this.addCreditNoteSpecificData(doc, creditNote);
@@ -29,20 +30,20 @@ export class UBLEncoder extends UBLBaseEncoder {
   }
   
   /**
-   * Encodes a debit note (invoice) into UBL XML
-   * @param debitNote Debit note to encode
+   * Encodes an invoice document (invoice, debit note or self-billed invoice) into UBL XML
+   * @param invoice Invoice document to encode
    * @returns UBL XML string
    */
-  protected async encodeDebitNote(debitNote: TDebitNote): Promise<string> {
+  protected async encodeInvoice(invoice: TInvoiceDocument): Promise<string> {
     // Create XML document from template
     const xmlString = this.createXmlRoot(UBLDocumentType.INVOICE);
     const doc = new DOMParser().parseFromString(xmlString, 'application/xml');
     
     // Add common document elements
-    this.addCommonElements(doc, debitNote as unknown as TInvoice, UBLDocumentType.INVOICE);
+    this.addCommonElements(doc, invoice, UBLDocumentType.INVOICE);
     
     // Add invoice specific data
-    this.addInvoiceSpecificData(doc, debitNote);
+    this.addInvoiceSpecificData(doc, invoice);
     
     // Serialize to string
     return new XMLSerializer().serializeToString(doc);
@@ -54,7 +55,7 @@ export class UBLEncoder extends UBLBaseEncoder {
    * @param invoice Invoice or credit note data
    * @param documentType Document type (Invoice or CreditNote)
    */
-  private addCommonElements(doc: Document, invoice: TInvoice, documentType: UBLDocumentType): void {
+  private addCommonElements(doc: Document, invoice: TAccountingDoc, documentType: UBLDocumentType): void {
     const root = doc.documentElement;
     
     // UBL Version ID (2.1 is standard for EN16931)
@@ -79,12 +80,13 @@ export class UBLEncoder extends UBLBaseEncoder {
       dueDate.setDate(dueDate.getDate() + (invoice.dueInDays || 30));
       this.appendElement(doc, root, 'cbc:DueDate', this.formatDate(dueDate.getTime()));
     }
-    // Document Type Code (380 invoice, 381 credit note; the element differs per schema)
-    if (documentType === UBLDocumentType.INVOICE) {
-      this.appendElement(doc, root, 'cbc:InvoiceTypeCode', '380');
-    } else {
-      this.appendElement(doc, root, 'cbc:CreditNoteTypeCode', '381');
-    }
+    // Document Type Code (380 invoice, 381 credit note, 383 debit note, 389 self-billed invoice; the element differs per schema)
+    this.appendElement(
+      doc,
+      root,
+      documentType === UBLDocumentType.INVOICE ? 'cbc:InvoiceTypeCode' : 'cbc:CreditNoteTypeCode',
+      getDocumentTypeCode(invoice.accountingDocType),
+    );
     
     // Notes - include subject as first note if it exists
     const allNotes: string[] = [];
@@ -140,7 +142,7 @@ export class UBLEncoder extends UBLBaseEncoder {
    * @param doc XML document
    * @param invoice Invoice data
    */
-  private addInvoiceSpecificData(doc: Document, invoice: TDebitNote): void {
+  private addInvoiceSpecificData(doc: Document, invoice: TInvoiceDocument): void {
     // For now, there's no specific data to add for invoices that's not already covered
     // If needed, additional invoice specific fields would be added here
   }
@@ -247,7 +249,7 @@ export class UBLEncoder extends UBLBaseEncoder {
    * @param parentElement Parent element
    * @param invoice Invoice data
    */
-  private addPaymentTerms(doc: Document, parentElement: Element, invoice: TInvoice): void {
+  private addPaymentTerms(doc: Document, parentElement: Element, invoice: TAccountingDoc): void {
     const paymentTermsNode = doc.createElement('cac:PaymentTerms');
     parentElement.appendChild(paymentTermsNode);
     
@@ -266,7 +268,7 @@ export class UBLEncoder extends UBLBaseEncoder {
    * @param parentElement Parent element
    * @param invoice Invoice data
    */
-  private addPaymentMeans(doc: Document, parentElement: Element, invoice: TInvoice): void {
+  private addPaymentMeans(doc: Document, parentElement: Element, invoice: TAccountingDoc): void {
     const paymentOptions = invoice.paymentOptions;
     if (!paymentOptions) {
       return;
@@ -315,7 +317,7 @@ export class UBLEncoder extends UBLBaseEncoder {
    * @param parentElement Parent element
    * @param invoice Invoice data
    */
-  private addTaxTotal(doc: Document, parentElement: Element, invoice: TInvoice): void {
+  private addTaxTotal(doc: Document, parentElement: Element, invoice: TAccountingDoc): void {
     const taxTotalNode = doc.createElement('cac:TaxTotal');
     parentElement.appendChild(taxTotalNode);
     
@@ -392,7 +394,7 @@ export class UBLEncoder extends UBLBaseEncoder {
    * @param parentElement Parent element
    * @param invoice Invoice data
    */
-  private addLegalMonetaryTotal(doc: Document, parentElement: Element, invoice: TInvoice): void {
+  private addLegalMonetaryTotal(doc: Document, parentElement: Element, invoice: TAccountingDoc): void {
     const legalMonetaryTotalNode = doc.createElement('cac:LegalMonetaryTotal');
     parentElement.appendChild(legalMonetaryTotalNode);
     
@@ -444,7 +446,7 @@ export class UBLEncoder extends UBLBaseEncoder {
    * @param parentElement Parent element
    * @param invoice Invoice data
    */
-  private addInvoiceLines(doc: Document, parentElement: Element, invoice: TInvoice, documentType: UBLDocumentType = UBLDocumentType.INVOICE): void {
+  private addInvoiceLines(doc: Document, parentElement: Element, invoice: TAccountingDoc, documentType: UBLDocumentType = UBLDocumentType.INVOICE): void {
     if (!invoice.items) return;
     const creditNote = documentType === UBLDocumentType.CREDIT_NOTE;
     
@@ -457,7 +459,10 @@ export class UBLEncoder extends UBLBaseEncoder {
       
       // Invoiced quantity
       const quantityElement = doc.createElement(creditNote ? 'cbc:CreditedQuantity' : 'cbc:InvoicedQuantity');
-      quantityElement.setAttribute('unitCode', item.unitType);
+      // a line without a unit is written without one, so that BR-23 reports it
+      if (item.unitType) {
+        quantityElement.setAttribute('unitCode', item.unitType);
+      }
       quantityElement.textContent = item.unitQuantity.toString();
       invoiceLineNode.appendChild(quantityElement);
       
@@ -544,7 +549,7 @@ export class UBLEncoder extends UBLBaseEncoder {
    * @param root Root element
    * @param invoice Invoice data
    */
-  private preserveMetadata(doc: Document, root: Element, invoice: TInvoice): void {
+  private preserveMetadata(doc: Document, root: Element, invoice: TAccountingDoc): void {
     // Extract metadata if available
     const metadata = (invoice as any).metadata?.extensions;
     if (!metadata) return;
@@ -815,7 +820,7 @@ export class UBLEncoder extends UBLBaseEncoder {
    * @param doc XML document
    * @param invoice Invoice data
    */
-  private enhancePartyInformationUBL(doc: Document, invoice: TInvoice): void {
+  private enhancePartyInformationUBL(doc: Document, invoice: TAccountingDoc): void {
     // Enhance supplier party
     this.enhancePartyUBL(doc, 'cac:AccountingSupplierParty', invoice.from);
     
@@ -940,7 +945,7 @@ export class UBLEncoder extends UBLBaseEncoder {
    * @param doc XML document
    * @param invoice Invoice data
    */
-  private enhanceLineItemsUBL(doc: Document, invoice: TInvoice): void {
+  private enhanceLineItemsUBL(doc: Document, invoice: TAccountingDoc): void {
     const invoiceLines = doc.getElementsByTagName('cac:InvoiceLine');
     
     for (let i = 0; i < invoiceLines.length && i < invoice.items.length; i++) {

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

@@ -1,8 +1,9 @@
 import { BaseDecoder } from '../base/base.decoder.js';
-import type { TInvoice, TCreditNote, TDebitNote } from '../../interfaces/common.js';
+import type { TAccountingDoc, TCreditNote, TInvoiceDocument } from '../../interfaces/common.js';
 import { UBLDocumentType, UBL_NAMESPACES } from './ubl.types.js';
 import { DOMParser, xpath } from '../../plugins.js';
 import { EInvoiceParsingError } from '../../errors.js';
+import { getAccountingDocType } from '../utils/document.typecode.js';
 
 const ublParser = new DOMParser();
 const ublNamespaces = {
@@ -37,18 +38,23 @@ export abstract class UBLBaseDecoder extends BaseDecoder {
   }
 
   /**
-   * Decodes UBL XML into a TInvoice object
-   * @returns Promise resolving to a TInvoice object
+   * Decodes UBL XML into an accounting document
+   * @returns Promise resolving to the accounting document
    */
-  public async decode(): Promise<TInvoice> {
-    // Determine document type
-    const documentType = this.getDocumentType();
-
-    if (documentType === UBLDocumentType.CREDIT_NOTE) {
-      return this.decodeCreditNote() as unknown as TInvoice;
-    } else {
-      return this.decodeDebitNote() as unknown as TInvoice;
+  public async decode(): Promise<TAccountingDoc> {
+    // a CreditNote root is a credit note whatever its type code says
+    if (this.getDocumentType() === UBLDocumentType.CREDIT_NOTE) {
+      return this.decodeCreditNote();
     }
+
+    // an Invoice root takes its type from the document type code (BT-3)
+    const accountingDocType = getAccountingDocType(
+      this.getText('./cbc:InvoiceTypeCode', this.doc.documentElement),
+    );
+    if (accountingDocType === 'creditnote') {
+      return this.decodeCreditNote();
+    }
+    return this.decodeInvoice(accountingDocType);
   }
 
   /**
@@ -83,10 +89,13 @@ export abstract class UBLBaseDecoder extends BaseDecoder {
   protected abstract decodeCreditNote(): Promise<TCreditNote>;
 
   /**
-   * Decodes a UBL debit note (invoice)
-   * @returns Promise resolving to a TDebitNote object
+   * Decodes a UBL invoice document: an 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
    */
-  protected abstract decodeDebitNote(): Promise<TDebitNote>;
+  protected abstract decodeInvoice(
+    accountingDocType: TInvoiceDocument['accountingDocType'],
+  ): Promise<TInvoiceDocument>;
 
   /**
    * Gets a text value from an XPath expression

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

@@ -1,5 +1,5 @@
 import { BaseEncoder } from '../base/base.encoder.js';
-import type { TInvoice, TCreditNote, TDebitNote } from '../../interfaces/common.js';
+import type { TAccountingDoc, TCreditNote, TInvoiceDocument } from '../../interfaces/common.js';
 import { UBLDocumentType, UBL_NAMESPACES } from './ubl.types.js';
 
 /**
@@ -7,16 +7,16 @@ import { UBLDocumentType, UBL_NAMESPACES } from './ubl.types.js';
  */
 export abstract class UBLBaseEncoder extends BaseEncoder {
   /**
-   * Encodes a TInvoice object into UBL XML
-   * @param invoice TInvoice object to encode
+   * Encodes an accounting document into UBL XML
+   * @param invoice Accounting document to encode
    * @returns UBL XML string
    */
-  public async encode(invoice: TInvoice): Promise<string> {
-    // a credit note takes the credit-note path (type code 381); everything else is encoded as an invoice
-    if ((invoice as { accountingDocType?: string }).accountingDocType === 'creditnote') {
-      return this.encodeCreditNote(invoice as unknown as TCreditNote);
+  public async encode(invoice: TAccountingDoc): Promise<string> {
+    // a credit note is a CreditNote document; an invoice, a debit note and a self-billed invoice are Invoice documents that differ in their type code
+    if (invoice.accountingDocType === 'creditnote') {
+      return this.encodeCreditNote(invoice);
     }
-    return this.encodeDebitNote(invoice as unknown as TDebitNote);
+    return this.encodeInvoice(invoice);
   }
 
   /**
@@ -27,11 +27,11 @@ export abstract class UBLBaseEncoder extends BaseEncoder {
   protected abstract encodeCreditNote(creditNote: TCreditNote): Promise<string>;
 
   /**
-   * Encodes a TDebitNote object into UBL XML
-   * @param debitNote TDebitNote object to encode
+   * Encodes an invoice document (invoice, debit note or self-billed invoice) into UBL XML
+   * @param invoice Invoice document to encode
    * @returns UBL XML string
    */
-  protected abstract encodeDebitNote(debitNote: TDebitNote): Promise<string>;
+  protected abstract encodeInvoice(invoice: TInvoiceDocument): Promise<string>;
 
   /**
    * Creates the XML declaration and root element

package/ts/formats/ubl/ubl.validator.ts

@@ -3,6 +3,7 @@ import { ValidationLevel } from '../../interfaces/common.js';
 import type { ValidationResult } from '../../interfaces/common.js';
 import { UBLDocumentType, UBL_NAMESPACES } from './ubl.types.js';
 import { DOMParser, xpath } from '../../plugins.js';
+import { meetsUnitCodeRule } from '../utils/unit.codes.js';
 
 const ublValidatorParser = new DOMParser();
 const ublValidatorNamespaces = {
@@ -104,6 +105,52 @@ export abstract class UBLBaseValidator extends BaseValidator {
    */
   protected abstract validateStructure(): boolean;
 
+  /**
+   * BR-23: every invoice or credit note line has a unit code on its invoiced or credited quantity.
+   * @returns True if every line has one
+   */
+  protected validateLineUnitCodePresence(): boolean {
+    // BR-23: every invoice or credit note line (BG-25) has an invoiced quantity unit of measure code (BT-130)
+    const lines = this.select('//cac:InvoiceLine | //cac:CreditNoteLine', this.doc) as Element[];
+    let valid = true;
+    for (const line of lines) {
+      if (!this.exists('./cbc:InvoicedQuantity/@unitCode | ./cbc:CreditedQuantity/@unitCode', line)) {
+        this.addError(
+          'BR-23',
+          'An Invoice line (BG-25) shall have an Invoiced quantity unit of measure code (BT-130)',
+          this.locationOf(line)
+        );
+        valid = false;
+      }
+    }
+    return valid;
+  }
+
+  /**
+   * BR-CL-23: every unit code of an invoiced, credited or base quantity (BT-130, BT-150) is a
+   * code of UN/ECE Recommendation 20 with the Recommendation 21 extension.
+   * @returns True if every unit code passed
+   */
+  protected validateUnitCodes(): boolean {
+    const quantities = this.select(
+      '//cbc:InvoicedQuantity[@unitCode] | //cbc:CreditedQuantity[@unitCode] | //cbc:BaseQuantity[@unitCode]',
+      this.doc
+    ) as Element[];
+    let valid = true;
+    for (const quantity of quantities) {
+      const unitCode = quantity.getAttribute('unitCode') ?? '';
+      if (!meetsUnitCodeRule(unitCode)) {
+        this.addError(
+          'BR-CL-23',
+          `Unit code MUST be coded according to the UN/ECE Recommendation 20 with Rec 21 extension; found "${unitCode}"`,
+          `${this.locationOf(quantity)}/@unitCode`
+        );
+        valid = false;
+      }
+    }
+    return valid;
+  }
+
   /**
    * Gets a text value from an XPath expression
    * @param xpath XPath expression

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

@@ -1,5 +1,10 @@
 import { UBLBaseDecoder } from '../ubl.decoder.js';
-import type { TInvoice, TCreditNote, TDebitNote } from '../../../interfaces/common.js';
+import type {
+  TAccountingDocEnvelope,
+  TAccountingDocType,
+  TCreditNote,
+  TInvoiceDocument,
+} from '../../../interfaces/common.js';
 import { business, finance } from '../../../plugins.js';
 import { UBLDocumentType } from '../ubl.types.js';
 import { EN16931Validator } from '../../validation/en16931.validator.js';
@@ -14,36 +19,28 @@ export class XRechnungDecoder extends UBLBaseDecoder {
    * @returns Promise resolving to a TCreditNote object
    */
   protected async decodeCreditNote(): Promise<TCreditNote> {
-    // Extract common data
-    const commonData = await this.extractCommonData();
-
-    // Return the invoice data as a credit note
-    return {
-      ...commonData,
-      accountingDocType: 'creditnote' as const
-    } as unknown as TCreditNote;
+    return this.extractCommonData('creditnote');
   }
 
   /**
-   * Decodes a UBL debit note (invoice)
-   * @returns Promise resolving to a TDebitNote object
+   * Decodes a UBL invoice document: an 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
    */
-  protected async decodeDebitNote(): Promise<TDebitNote> {
-    // Extract common data
-    const commonData = await this.extractCommonData();
-
-    // Return the invoice data as a debit note
-    return {
-      ...commonData,
-      accountingDocType: 'debitnote' as const
-    } as unknown as TDebitNote;
+  protected async decodeInvoice(
+    accountingDocType: TInvoiceDocument['accountingDocType'],
+  ): Promise<TInvoiceDocument> {
+    return this.extractCommonData(accountingDocType);
   }
 
   /**
    * Extracts common invoice data from XRechnung XML
+   * @param accountingDocType The type the document is decoded as
    * @returns Common invoice data
    */
-  private async extractCommonData(): Promise<Partial<TInvoice>> {
+  private async extractCommonData<TYPE extends TAccountingDocType>(
+    accountingDocType: TYPE,
+  ): Promise<TAccountingDocEnvelope<TYPE, {}>> {
     try {
       const root = this.doc.documentElement;
       const invoiceId = this.getRequiredText(
@@ -86,7 +83,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);
@@ -236,10 +234,12 @@ export class XRechnungDecoder extends UBLBaseDecoder {
       // Create the common invoice data with metadata only when the source XML actually contains it.
       const invoiceData: any = {
         type: 'accounting-doc' as const,
-        accountingDocType: 'invoice' as const,
+        accountingDocType,
         id: invoiceId,
         accountingDocId: invoiceId,
         date: issueDate,
+        // a document read from XML has been issued; the envelope carries that as the document and the accounting status
+        status: 'issued',
         accountingDocStatus: 'issued' as const,
         versionInfo: {
           type: 'final',