@fin.cx/einvoice 7.1.0 → 8.1.0

package/ts/formats/cii/cii.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 { CII_NAMESPACES, CIIProfile } from './cii.types.js';
 import { DOMParser, xpath } from '../../plugins.js';
 import { EInvoiceParsingError } from '../../errors.js';
+import { getAccountingDocType } from '../utils/document.typecode.js';
 
 const ciiParser = new DOMParser();
 const ciiNamespaces = {
@@ -42,18 +43,18 @@ export abstract class CIIBaseDecoder extends BaseDecoder {
   }
 
   /**
-   * Decodes CII XML into a TInvoice object
-   * @returns Promise resolving to a TInvoice object
+   * Decodes CII XML into an accounting document
+   * @returns Promise resolving to the accounting document
    */
-  public async decode(): Promise<TInvoice> {
-    // Determine if it's a credit note or debit note based on type code
-    const typeCode = this.getText('//ram:TypeCode');
-
-    if (typeCode === '381') { // Credit note type code
-      return this.decodeCreditNote() as unknown as TInvoice;
-    } else {
-      return this.decodeDebitNote() as unknown as TInvoice;
+  public async decode(): Promise<TAccountingDoc> {
+    // CII has one root for every document; the document type code (BT-3) alone tells them apart
+    const accountingDocType = getAccountingDocType(
+      this.getText('/rsm:CrossIndustryInvoice/rsm:ExchangedDocument/ram:TypeCode'),
+    );
+    if (accountingDocType === 'creditnote') {
+      return this.decodeCreditNote();
     }
+    return this.decodeInvoice(accountingDocType);
   }
 
   /**
@@ -90,10 +91,13 @@ export abstract class CIIBaseDecoder extends BaseDecoder {
   protected abstract decodeCreditNote(): Promise<TCreditNote>;
 
   /**
-   * Decodes a CII debit note (invoice)
-   * @returns Promise resolving to a TDebitNote object
+   * Decodes a CII 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/cii/cii.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 { CII_NAMESPACES, CIIProfile } from './cii.types.js';
 
 /**
@@ -17,16 +17,16 @@ export abstract class CIIBaseEncoder extends BaseEncoder {
   }
 
   /**
-   * Encodes a TInvoice object into CII XML
-   * @param invoice TInvoice object to encode
+   * Encodes an accounting document into CII XML
+   * @param invoice Accounting document to encode
    * @returns CII 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> {
+    // CII has one root for every document; the two paths differ in the type code they write
+    if (invoice.accountingDocType === 'creditnote') {
+      return this.encodeCreditNote(invoice);
     }
-    return this.encodeDebitNote(invoice as unknown as TDebitNote);
+    return this.encodeInvoice(invoice);
   }
 
   /**
@@ -37,11 +37,11 @@ export abstract class CIIBaseEncoder extends BaseEncoder {
   protected abstract encodeCreditNote(creditNote: TCreditNote): Promise<string>;
 
   /**
-   * Encodes a TDebitNote object into CII XML
-   * @param debitNote TDebitNote object to encode
+   * Encodes an invoice document (invoice, debit note or self-billed invoice) into CII XML
+   * @param invoice Invoice document to encode
    * @returns CII 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/cii/cii.validator.ts

@@ -3,6 +3,7 @@ import { ValidationLevel } from '../../interfaces/common.js';
 import type { ValidationResult } from '../../interfaces/common.js';
 import { CII_NAMESPACES, CIIProfile } from './cii.types.js';
 import { DOMParser, xpath } from '../../plugins.js';
+import { meetsUnitCodeRule } from '../utils/unit.codes.js';
 
 const ciiValidatorParser = new DOMParser();
 const ciiValidatorNamespaces = {
@@ -113,6 +114,52 @@ export abstract class CIIBaseValidator extends BaseValidator {
    */
   protected abstract validateStructure(): boolean;
 
+  /**
+   * BR-23: every invoice line has a unit code on its billed quantity.
+   * @returns True if every line has one
+   */
+  protected validateLineUnitCodePresence(): boolean {
+    // BR-23: every invoice line (BG-25) has an invoiced quantity unit of measure code (BT-130)
+    const lines = this.select('//ram:IncludedSupplyChainTradeLineItem', this.doc) as Element[];
+    let valid = true;
+    for (const line of lines) {
+      if (!this.exists('./ram:SpecifiedLineTradeDelivery/ram:BilledQuantity/@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 a billed or basis 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(
+      '//ram:BilledQuantity[@unitCode] | //ram:BasisQuantity[@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;
+  }
+
   /**
    * Detects the CII profile from the XML
    */

package/ts/formats/cii/facturx/facturx.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 { FACTURX_PROFILE_IDS } from './facturx.types.js';
 import { business, finance, general } from '../../../plugins.js';
 import { EN16931Validator } from '../../validation/en16931.validator.js';
@@ -13,36 +18,28 @@ export class FacturXDecoder 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 Factur-X debit note (invoice)
-   * @returns Promise resolving to a TDebitNote object
+   * Decodes a Factur-X 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 Factur-X 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.getRequiredText(
       '/rsm:CrossIndustryInvoice/rsm:ExchangedDocument/ram:ID',
@@ -101,10 +98,12 @@ export class FacturXDecoder 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,
@@ -192,7 +191,8 @@ export class FacturXDecoder 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/facturx/facturx.encoder.ts

@@ -1,10 +1,11 @@
 import { CIIBaseEncoder } from '../cii.encoder.js';
-import type { TInvoice, TCreditNote, TDebitNote } from '../../../interfaces/common.js';
+import type { TAccountingDoc, TCreditNote, TInvoiceDocument } from '../../../interfaces/common.js';
 import { FACTURX_PROFILE_IDS } from './facturx.types.js';
 import { DOMParser, XMLSerializer } from '../../../plugins.js';
 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';
 
 /**
  * Encoder for Factur-X invoice format
@@ -20,29 +21,29 @@ export class FacturXEncoder extends CIIBaseEncoder {
     const xmlDoc = this.createBaseXml();
 
     // Set document type code to credit note (381)
-    this.setDocumentTypeCode(xmlDoc, '381');
+    this.setDocumentTypeCode(xmlDoc, getDocumentTypeCode(creditNote.accountingDocType));
 
     // Add common invoice data
-    this.addCommonInvoiceData(xmlDoc, creditNote as unknown as TInvoice);
+    this.addCommonInvoiceData(xmlDoc, creditNote);
 
     // Serialize to string
     return new XMLSerializer().serializeToString(xmlDoc);
   }
 
   /**
-   * Encodes a TDebitNote object into Factur-X XML
-   * @param debitNote TDebitNote object to encode
+   * Encodes an invoice document (invoice, debit note or self-billed invoice) into Factur-X XML
+   * @param invoice Invoice document to encode
    * @returns Factur-X XML string
    */
-  protected async encodeDebitNote(debitNote: TDebitNote): Promise<string> {
+  protected async encodeInvoice(invoice: TInvoiceDocument): Promise<string> {
     // Create base XML
     const xmlDoc = this.createBaseXml();
 
-    // Set document type code to invoice (380)
-    this.setDocumentTypeCode(xmlDoc, '380');
+    // Set document type code (380 invoice, 383 debit note, 389 self-billed invoice)
+    this.setDocumentTypeCode(xmlDoc, getDocumentTypeCode(invoice.accountingDocType));
 
     // Add common invoice data
-    this.addCommonInvoiceData(xmlDoc, debitNote as unknown as TInvoice);
+    this.addCommonInvoiceData(xmlDoc, invoice);
 
     // Serialize to string
     return new XMLSerializer().serializeToString(xmlDoc);
@@ -100,7 +101,7 @@ export class FacturXEncoder extends CIIBaseEncoder {
   /**
    * Sets the document type code in the XML document
    * @param doc XML document
-   * @param typeCode Document type code (380 for invoice, 381 for credit note)
+   * @param typeCode Document type code (380 invoice, 381 credit note, 383 debit note, 389 self-billed invoice)
    */
   private setDocumentTypeCode(doc: Document, typeCode: string): void {
     // Get root element
@@ -124,7 +125,7 @@ export class FacturXEncoder extends CIIBaseEncoder {
    * @param doc XML document
    * @param invoice Invoice data
    */
-  private addCommonInvoiceData(doc: Document, invoice: TInvoice): void {
+  private addCommonInvoiceData(doc: Document, invoice: TAccountingDoc): void {
     // Get root element
     const root = doc.documentElement;
 
@@ -192,7 +193,7 @@ export class FacturXEncoder extends CIIBaseEncoder {
    * @param transactionElement Transaction element
    * @param invoice Invoice data
    */
-  private addAgreementSection(doc: Document, transactionElement: Element, invoice: TInvoice): void {
+  private addAgreementSection(doc: Document, transactionElement: Element, invoice: TAccountingDoc): void {
     // Create agreement element
     const agreementElement = doc.createElement('ram:ApplicableHeaderTradeAgreement');
     transactionElement.appendChild(agreementElement);
@@ -277,7 +278,7 @@ export class FacturXEncoder extends CIIBaseEncoder {
    * @param transactionElement Transaction element
    * @param invoice Invoice data
    */
-  private addDeliverySection(doc: Document, transactionElement: Element, invoice: TInvoice): void {
+  private addDeliverySection(doc: Document, transactionElement: Element, invoice: TAccountingDoc): void {
     // Create delivery element
     const deliveryElement = doc.createElement('ram:ApplicableHeaderTradeDelivery');
     transactionElement.appendChild(deliveryElement);
@@ -301,7 +302,7 @@ export class FacturXEncoder extends CIIBaseEncoder {
    * @param transactionElement Transaction element
    * @param invoice Invoice data
    */
-  private addSettlementSection(doc: Document, transactionElement: Element, invoice: TInvoice): void {
+  private addSettlementSection(doc: Document, transactionElement: Element, invoice: TAccountingDoc): void {
     // Create settlement element
     const settlementElement = doc.createElement('ram:ApplicableHeaderTradeSettlement');
     transactionElement.appendChild(settlementElement);
@@ -383,7 +384,7 @@ export class FacturXEncoder extends CIIBaseEncoder {
    * @param transactionElement Transaction element
    * @param invoice Invoice data
    */
-  private addLineItems(doc: Document, transactionElement: Element, invoice: TInvoice): void {
+  private addLineItems(doc: Document, transactionElement: Element, invoice: TAccountingDoc): void {
     const calculator = new DecimalCurrencyCalculator(invoice.currency);
     const minorUnits = getCurrencyMinorUnits(invoice.currency);
 
@@ -430,7 +431,10 @@ export class FacturXEncoder extends CIIBaseEncoder {
         const deliveryElement = doc.createElement('ram:SpecifiedLineTradeDelivery');
         const quantityElement = doc.createElement('ram:BilledQuantity');
         quantityElement.textContent = item.unitQuantity.toString();
-        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);
+        }
         deliveryElement.appendChild(quantityElement);
         lineItemElement.appendChild(deliveryElement);
 

package/ts/formats/cii/facturx/facturx.validator.ts

@@ -24,14 +24,14 @@ export class FacturXValidator extends CIIBaseValidator {
     ];
 
     for (const section of sections) {
-      if (!this.exists(section)) {
+      if (!this.exists(`/rsm:CrossIndustryInvoice/${section}`)) {
         this.addError('FX-STRUCT-1', `Required section ${section} is missing`, '/rsm:CrossIndustryInvoice');
         valid = false;
       }
     }
 
     // Check for SupplyChainTradeTransaction sections
-    if (this.exists('rsm:SupplyChainTradeTransaction')) {
+    if (this.exists('/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction')) {
       const tradeSubsections = [
         'ram:ApplicableHeaderTradeAgreement',
         'ram:ApplicableHeaderTradeDelivery',
@@ -39,7 +39,7 @@ export class FacturXValidator extends CIIBaseValidator {
       ];
 
       for (const subsection of tradeSubsections) {
-        if (!this.exists(`rsm:SupplyChainTradeTransaction/${subsection}`)) {
+        if (!this.exists(`/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/${subsection}`)) {
           this.addError('FX-STRUCT-2', `Required subsection ${subsection} is missing`,
             '/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction');
           valid = false;
@@ -70,6 +70,12 @@ export class FacturXValidator extends CIIBaseValidator {
     // and/or the Seller tax representative VAT identifier (BT-63).
     valid = this.validateSellerVatIdentifier() && valid;
 
+    // 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;
+
     return valid;
   }
 

package/ts/formats/cii/zugferd/zugferd.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 { business, finance } from '../../../plugins.js';
 import { EN16931Validator } from '../../validation/en16931.validator.js';
 
@@ -12,36 +17,28 @@ export class ZUGFeRDDecoder 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 debit note (invoice)
-   * @returns Promise resolving to a TDebitNote object
+   * Decodes a ZUGFeRD 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 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('//rsm:ExchangedDocument/ram:ID');
 
@@ -92,10 +89,12 @@ export class ZUGFeRDDecoder 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,
@@ -196,7 +195,8 @@ export class ZUGFeRDDecoder 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.encoder.ts

@@ -1,8 +1,9 @@
 import { CIIBaseEncoder } from '../cii.encoder.js';
-import type { TInvoice, TCreditNote, TDebitNote } from '../../../interfaces/common.js';
+import type { TAccountingDoc, TCreditNote, TInvoiceDocument } from '../../../interfaces/common.js';
 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';
 
 /**
  * Encoder for ZUGFeRD invoice format
@@ -24,29 +25,29 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
     const xmlDoc = this.createBaseXml();
 
     // Set document type code to credit note (381)
-    this.setDocumentTypeCode(xmlDoc, '381');
+    this.setDocumentTypeCode(xmlDoc, getDocumentTypeCode(creditNote.accountingDocType));
 
     // Add common invoice data
-    this.addCommonInvoiceData(xmlDoc, creditNote as unknown as TInvoice);
+    this.addCommonInvoiceData(xmlDoc, creditNote);
 
     // Serialize to string
     return new XMLSerializer().serializeToString(xmlDoc);
   }
 
   /**
-   * Encodes a debit note (invoice) into ZUGFeRD XML
-   * @param debitNote Debit note to encode
+   * Encodes an invoice document (invoice, debit note or self-billed invoice) into ZUGFeRD XML
+   * @param invoice Invoice document to encode
    * @returns ZUGFeRD XML string
    */
-  protected async encodeDebitNote(debitNote: TDebitNote): Promise<string> {
+  protected async encodeInvoice(invoice: TInvoiceDocument): Promise<string> {
     // Create base XML
     const xmlDoc = this.createBaseXml();
 
-    // Set document type code to invoice (380)
-    this.setDocumentTypeCode(xmlDoc, '380');
+    // Set document type code (380 invoice, 383 debit note, 389 self-billed invoice)
+    this.setDocumentTypeCode(xmlDoc, getDocumentTypeCode(invoice.accountingDocType));
 
     // Add common invoice data
-    this.addCommonInvoiceData(xmlDoc, debitNote as unknown as TInvoice);
+    this.addCommonInvoiceData(xmlDoc, invoice);
 
     // Serialize to string
     return new XMLSerializer().serializeToString(xmlDoc);
@@ -128,7 +129,7 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
    * @param doc XML document
    * @param invoice Invoice data
    */
-  private addCommonInvoiceData(doc: Document, invoice: TInvoice): void {
+  private addCommonInvoiceData(doc: Document, invoice: TAccountingDoc): void {
     // Get root element
     const root = doc.documentElement;
 
@@ -196,7 +197,7 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
    * @param transactionElement Transaction element
    * @param invoice Invoice data
    */
-  private addAgreementSection(doc: Document, transactionElement: Element, invoice: TInvoice): void {
+  private addAgreementSection(doc: Document, transactionElement: Element, invoice: TAccountingDoc): void {
     // Create agreement element
     const agreementElement = doc.createElement('ram:ApplicableHeaderTradeAgreement');
     transactionElement.appendChild(agreementElement);
@@ -309,7 +310,7 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
    * @param transactionElement Transaction element
    * @param invoice Invoice data
    */
-  private addDeliverySection(doc: Document, transactionElement: Element, invoice: TInvoice): void {
+  private addDeliverySection(doc: Document, transactionElement: Element, invoice: TAccountingDoc): void {
     // Create delivery element
     const deliveryElement = doc.createElement('ram:ApplicableHeaderTradeDelivery');
     transactionElement.appendChild(deliveryElement);
@@ -360,7 +361,7 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
    * @param transactionElement Transaction element
    * @param invoice Invoice data
    */
-  private addSettlementSection(doc: Document, transactionElement: Element, invoice: TInvoice): void {
+  private addSettlementSection(doc: Document, transactionElement: Element, invoice: TAccountingDoc): void {
     // Create settlement element
     const settlementElement = doc.createElement('ram:ApplicableHeaderTradeSettlement');
     transactionElement.appendChild(settlementElement);
@@ -447,7 +448,7 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
    * @param settlementElement Settlement element
    * @param invoice Invoice data
    */
-  private addTaxDetails(doc: Document, settlementElement: Element, invoice: TInvoice): void {
+  private addTaxDetails(doc: Document, settlementElement: Element, invoice: TAccountingDoc): void {
     // Calculate tax categories and totals
     const taxCategories = new Map<number, number>(); // Map of VAT rate to net amount
 
@@ -504,7 +505,7 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
    * @param settlementElement Settlement element
    * @param invoice Invoice data
    */
-  private addMonetarySummation(doc: Document, settlementElement: Element, invoice: TInvoice): void {
+  private addMonetarySummation(doc: Document, settlementElement: Element, invoice: TAccountingDoc): void {
     const monetarySummationElement = doc.createElement('ram:SpecifiedTradeSettlementHeaderMonetarySummation');
 
     // Calculate totals
@@ -554,7 +555,7 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
    * @param transactionElement Transaction element
    * @param invoice Invoice data
    */
-  private addLineItems(doc: Document, transactionElement: Element, invoice: TInvoice): void {
+  private addLineItems(doc: Document, transactionElement: Element, invoice: TAccountingDoc): void {
     // Add each line item
     if (invoice.items) {
       for (const item of invoice.items) {
@@ -598,7 +599,10 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
         const deliveryElement = doc.createElement('ram:SpecifiedLineTradeDelivery');
         const quantityElement = doc.createElement('ram:BilledQuantity');
         quantityElement.textContent = item.unitQuantity.toString();
-        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);
+        }
         deliveryElement.appendChild(quantityElement);
         lineItemElement.appendChild(deliveryElement);