@fin.cx/einvoice 8.0.0 → 8.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/einvoice.d.ts +14 -1
- package/dist_ts/einvoice.js +48 -3
- package/dist_ts/formats/base/base.encoder.d.ts +1 -1
- package/dist_ts/formats/base/base.validator.d.ts +5 -0
- package/dist_ts/formats/base/base.validator.js +28 -1
- package/dist_ts/formats/cii/cii.decoder.d.ts +12 -1
- package/dist_ts/formats/cii/cii.decoder.js +34 -1
- package/dist_ts/formats/cii/cii.encoder.d.ts +14 -3
- package/dist_ts/formats/cii/cii.encoder.js +58 -6
- package/dist_ts/formats/cii/cii.types.d.ts +1 -0
- package/dist_ts/formats/cii/cii.types.js +3 -2
- package/dist_ts/formats/cii/cii.validator.d.ts +11 -0
- package/dist_ts/formats/cii/cii.validator.js +35 -1
- package/dist_ts/formats/cii/facturx/facturx.decoder.d.ts +1 -1
- package/dist_ts/formats/cii/facturx/facturx.decoder.js +11 -5
- package/dist_ts/formats/cii/facturx/facturx.encoder.d.ts +2 -2
- package/dist_ts/formats/cii/facturx/facturx.encoder.js +17 -11
- package/dist_ts/formats/cii/facturx/facturx.validator.js +8 -4
- package/dist_ts/formats/cii/zugferd/zugferd.decoder.d.ts +1 -1
- package/dist_ts/formats/cii/zugferd/zugferd.decoder.js +11 -5
- package/dist_ts/formats/cii/zugferd/zugferd.encoder.d.ts +1 -1
- package/dist_ts/formats/cii/zugferd/zugferd.encoder.js +20 -14
- package/dist_ts/formats/cii/zugferd/zugferd.v1.decoder.d.ts +7 -1
- package/dist_ts/formats/cii/zugferd/zugferd.v1.decoder.js +29 -5
- package/dist_ts/formats/cii/zugferd/zugferd.validator.js +5 -4
- package/dist_ts/formats/converters/xml-to-einvoice.converter.d.ts +5 -0
- package/dist_ts/formats/converters/xml-to-einvoice.converter.js +11 -2
- package/dist_ts/formats/semantic/semantic.adapter.js +2 -2
- package/dist_ts/formats/ubl/en16931.ubl.validator.js +5 -1
- package/dist_ts/formats/ubl/generic/ubl.encoder.d.ts +23 -1
- package/dist_ts/formats/ubl/generic/ubl.encoder.js +71 -12
- package/dist_ts/formats/ubl/ubl.decoder.d.ts +1 -1
- package/dist_ts/formats/ubl/ubl.encoder.d.ts +16 -3
- package/dist_ts/formats/ubl/ubl.encoder.js +75 -13
- package/dist_ts/formats/ubl/ubl.validator.d.ts +11 -0
- package/dist_ts/formats/ubl/ubl.validator.js +35 -1
- package/dist_ts/formats/ubl/xrechnung/xrechnung.decoder.d.ts +6 -1
- package/dist_ts/formats/ubl/xrechnung/xrechnung.decoder.js +39 -8
- package/dist_ts/formats/ubl/xrechnung/xrechnung.encoder.d.ts +1 -1
- package/dist_ts/formats/ubl/xrechnung/xrechnung.encoder.js +4 -2
- package/dist_ts/formats/utils/date.value.d.ts +10 -0
- package/dist_ts/formats/utils/date.value.js +21 -0
- package/dist_ts/formats/utils/document.typecode.d.ts +3 -3
- package/dist_ts/formats/utils/document.typecode.js +8 -4
- package/dist_ts/formats/utils/preceding.invoice.d.ts +26 -0
- package/dist_ts/formats/utils/preceding.invoice.js +52 -0
- package/dist_ts/formats/utils/unit.codes.d.ts +40 -0
- package/dist_ts/formats/utils/unit.codes.js +193 -0
- package/dist_ts/formats/validation/codelist.validator.d.ts +1 -1
- package/dist_ts/formats/validation/codelist.validator.js +7 -9
- package/dist_ts/formats/validation/en16931.business-rules.validator.js +13 -13
- package/dist_ts/formats/validation/validation.types.d.ts +0 -4
- package/dist_ts/formats/validation/validation.types.js +1 -28
- package/dist_ts/index.d.ts +5 -1
- package/dist_ts/index.js +6 -1
- package/dist_ts/interfaces/common.d.ts +6 -2
- package/dist_ts_install/download-schematron.js +3 -5
- package/package.json +8 -8
- package/readme.md +103 -10
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/einvoice.ts +51 -2
- package/ts/formats/base/base.encoder.ts +1 -1
- package/ts/formats/base/base.validator.ts +28 -0
- package/ts/formats/cii/cii.decoder.ts +43 -1
- package/ts/formats/cii/cii.encoder.ts +62 -6
- package/ts/formats/cii/cii.types.ts +2 -1
- package/ts/formats/cii/cii.validator.ts +47 -0
- package/ts/formats/cii/facturx/facturx.decoder.ts +11 -4
- package/ts/formats/cii/facturx/facturx.encoder.ts +17 -10
- package/ts/formats/cii/facturx/facturx.validator.ts +9 -3
- package/ts/formats/cii/zugferd/zugferd.decoder.ts +11 -4
- package/ts/formats/cii/zugferd/zugferd.encoder.ts +20 -13
- package/ts/formats/cii/zugferd/zugferd.v1.decoder.ts +32 -4
- package/ts/formats/cii/zugferd/zugferd.validator.ts +4 -3
- package/ts/formats/converters/xml-to-einvoice.converter.ts +11 -1
- package/ts/formats/semantic/semantic.adapter.ts +1 -1
- package/ts/formats/ubl/en16931.ubl.validator.ts +6 -0
- package/ts/formats/ubl/generic/ubl.encoder.ts +78 -11
- package/ts/formats/ubl/ubl.decoder.ts +1 -1
- package/ts/formats/ubl/ubl.encoder.ts +77 -13
- package/ts/formats/ubl/ubl.validator.ts +47 -0
- package/ts/formats/ubl/xrechnung/xrechnung.decoder.ts +47 -7
- package/ts/formats/ubl/xrechnung/xrechnung.encoder.ts +4 -1
- package/ts/formats/utils/date.value.ts +21 -0
- package/ts/formats/utils/document.typecode.ts +7 -3
- package/ts/formats/utils/preceding.invoice.ts +74 -0
- package/ts/formats/utils/unit.codes.ts +215 -0
- package/ts/formats/validation/codelist.validator.ts +8 -19
- package/ts/formats/validation/en16931.business-rules.validator.ts +13 -13
- package/ts/formats/validation/validation.types.ts +0 -28
- package/ts/index.ts +12 -0
- package/ts/interfaces/common.ts +6 -1
|
@@ -2,6 +2,7 @@ import { BaseValidator } from '../base/base.validator.js';
|
|
|
2
2
|
import { ValidationLevel } from '../../interfaces/common.js';
|
|
3
3
|
import { CII_NAMESPACES, CIIProfile } from './cii.types.js';
|
|
4
4
|
import { DOMParser, xpath } from '../../plugins.js';
|
|
5
|
+
import { meetsUnitCodeRule } from '../utils/unit.codes.js';
|
|
5
6
|
const ciiValidatorParser = new DOMParser();
|
|
6
7
|
const ciiValidatorNamespaces = {
|
|
7
8
|
rsm: CII_NAMESPACES.RSM,
|
|
@@ -91,6 +92,39 @@ export class CIIBaseValidator extends BaseValidator {
|
|
|
91
92
|
}
|
|
92
93
|
return true;
|
|
93
94
|
}
|
|
95
|
+
/**
|
|
96
|
+
* BR-23: every invoice line has a unit code on its billed quantity.
|
|
97
|
+
* @returns True if every line has one
|
|
98
|
+
*/
|
|
99
|
+
validateLineUnitCodePresence() {
|
|
100
|
+
// BR-23: every invoice line (BG-25) has an invoiced quantity unit of measure code (BT-130)
|
|
101
|
+
const lines = this.select('//ram:IncludedSupplyChainTradeLineItem', this.doc);
|
|
102
|
+
let valid = true;
|
|
103
|
+
for (const line of lines) {
|
|
104
|
+
if (!this.exists('./ram:SpecifiedLineTradeDelivery/ram:BilledQuantity/@unitCode', line)) {
|
|
105
|
+
this.addError('BR-23', 'An Invoice line (BG-25) shall have an Invoiced quantity unit of measure code (BT-130)', this.locationOf(line));
|
|
106
|
+
valid = false;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
return valid;
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* BR-CL-23: every unit code of a billed or basis quantity (BT-130, BT-150) is a code of
|
|
113
|
+
* UN/ECE Recommendation 20 with the Recommendation 21 extension.
|
|
114
|
+
* @returns True if every unit code passed
|
|
115
|
+
*/
|
|
116
|
+
validateUnitCodes() {
|
|
117
|
+
const quantities = this.select('//ram:BilledQuantity[@unitCode] | //ram:BasisQuantity[@unitCode]', this.doc);
|
|
118
|
+
let valid = true;
|
|
119
|
+
for (const quantity of quantities) {
|
|
120
|
+
const unitCode = quantity.getAttribute('unitCode') ?? '';
|
|
121
|
+
if (!meetsUnitCodeRule(unitCode)) {
|
|
122
|
+
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`);
|
|
123
|
+
valid = false;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
return valid;
|
|
127
|
+
}
|
|
94
128
|
/**
|
|
95
129
|
* Detects the CII profile from the XML
|
|
96
130
|
*/
|
|
@@ -152,4 +186,4 @@ export class CIIBaseValidator extends BaseValidator {
|
|
|
152
186
|
return false;
|
|
153
187
|
}
|
|
154
188
|
}
|
|
155
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
189
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2lpLnZhbGlkYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL2Zvcm1hdHMvY2lpL2NpaS52YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzFELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUU3RCxPQUFPLEVBQUUsY0FBYyxFQUFFLFVBQVUsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzVELE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDcEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFM0QsTUFBTSxrQkFBa0IsR0FBRyxJQUFJLFNBQVMsRUFBRSxDQUFDO0FBQzNDLE1BQU0sc0JBQXNCLEdBQUc7SUFDN0IsR0FBRyxFQUFFLGNBQWMsQ0FBQyxHQUFHO0lBQ3ZCLEdBQUcsRUFBRSxjQUFjLENBQUMsR0FBRztJQUN2QixHQUFHLEVBQUUsY0FBYyxDQUFDLEdBQUc7Q0FDeEIsQ0FBQztBQUNGLE1BQU0sa0JBQWtCLEdBQUcsS0FBSyxDQUFDLGFBQWEsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO0FBRXZFOztHQUVHO0FBQ0gsTUFBTSxPQUFnQixnQkFBaUIsU0FBUSxhQUFhO0lBQ2hELEdBQUcsQ0FBWTtJQUNmLFVBQVUsQ0FBMEI7SUFDcEMsTUFBTSxDQUFxQjtJQUMzQixPQUFPLEdBQWUsVUFBVSxDQUFDLE9BQU8sQ0FBQztJQUVuRCxZQUFZLEdBQVcsRUFBRSxHQUFjO1FBQ3JDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUVYLElBQUksQ0FBQztZQUNILG9EQUFvRDtZQUNwRCxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsSUFBSSxrQkFBa0IsQ0FBQyxlQUFlLENBQUMsR0FBRyxFQUFFLGlCQUFpQixDQUFDLENBQUM7WUFF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
|
|
@@ -10,7 +10,7 @@ export declare class FacturXDecoder extends CIIBaseDecoder {
|
|
|
10
10
|
*/
|
|
11
11
|
protected decodeCreditNote(): Promise<TCreditNote>;
|
|
12
12
|
/**
|
|
13
|
-
* Decodes a Factur-X invoice document: an invoice, a debit note or a self-billed invoice
|
|
13
|
+
* Decodes a Factur-X invoice document: an invoice, a corrected invoice, a debit note or a self-billed invoice
|
|
14
14
|
* @param accountingDocType The type the document type code stands for
|
|
15
15
|
* @returns Promise resolving to the invoice document
|
|
16
16
|
*/
|
|
@@ -2,6 +2,7 @@ import { CIIBaseDecoder } from '../cii.decoder.js';
|
|
|
2
2
|
import { FACTURX_PROFILE_IDS } from './facturx.types.js';
|
|
3
3
|
import { business, finance, general } from '../../../plugins.js';
|
|
4
4
|
import { EN16931Validator } from '../../validation/en16931.validator.js';
|
|
5
|
+
import { getPrecedingInvoiceFields } from '../../utils/preceding.invoice.js';
|
|
5
6
|
/**
|
|
6
7
|
* Decoder for Factur-X invoice format
|
|
7
8
|
*/
|
|
@@ -14,7 +15,7 @@ export class FacturXDecoder extends CIIBaseDecoder {
|
|
|
14
15
|
return this.extractCommonData('creditnote');
|
|
15
16
|
}
|
|
16
17
|
/**
|
|
17
|
-
* Decodes a Factur-X invoice document: an invoice, a debit note or a self-billed invoice
|
|
18
|
+
* Decodes a Factur-X invoice document: an invoice, a corrected invoice, a debit note or a self-billed invoice
|
|
18
19
|
* @param accountingDocType The type the document type code stands for
|
|
19
20
|
* @returns Promise resolving to the invoice document
|
|
20
21
|
*/
|
|
@@ -61,6 +62,8 @@ export class FacturXDecoder extends CIIBaseDecoder {
|
|
|
61
62
|
subject = allNotes[0];
|
|
62
63
|
notes = allNotes.slice(1); // Remove subject from notes
|
|
63
64
|
}
|
|
65
|
+
// Extract the actual delivery date, if stated
|
|
66
|
+
const deliveryDate = this.extractDeliveryDate();
|
|
64
67
|
// Check for reverse charge
|
|
65
68
|
const reverseCharge = this.exists('//ram:SpecifiedTradeAllowanceCharge/ram:ReasonCode[text()="62"]');
|
|
66
69
|
// Create the common invoice data
|
|
@@ -87,8 +90,10 @@ export class FacturXDecoder extends CIIBaseDecoder {
|
|
|
87
90
|
reverseCharge: reverseCharge,
|
|
88
91
|
currency: currencyCode,
|
|
89
92
|
notes: notes,
|
|
90
|
-
|
|
91
|
-
|
|
93
|
+
// the day of supply as the document states it (BT-72)
|
|
94
|
+
...(deliveryDate === undefined ? {} : { deliveryDate }),
|
|
95
|
+
objectActions: [],
|
|
96
|
+
...getPrecedingInvoiceFields(accountingDocType, this.extractPrecedingInvoiceReferences()),
|
|
92
97
|
};
|
|
93
98
|
// Validate mandatory EN16931 fields unless validation is skipped
|
|
94
99
|
if (!this.skipValidation) {
|
|
@@ -148,7 +153,8 @@ export class FacturXDecoder extends CIIBaseDecoder {
|
|
|
148
153
|
const name = this.getText('ram:SpecifiedTradeProduct/ram:Name', itemNode);
|
|
149
154
|
const articleNumber = this.getText('ram:SpecifiedTradeProduct/ram:SellerAssignedID', itemNode);
|
|
150
155
|
const unitQuantity = this.getNumber('ram:SpecifiedLineTradeDelivery/ram:BilledQuantity', itemNode);
|
|
151
|
-
|
|
156
|
+
// an absent unit code (BT-130) stays absent, so that BR-23 reports it
|
|
157
|
+
const unitType = this.getText('ram:SpecifiedLineTradeDelivery/ram:BilledQuantity/@unitCode', itemNode);
|
|
152
158
|
const unitNetPrice = this.getNumber('ram:SpecifiedLineTradeAgreement/ram:NetPriceProductTradePrice/ram:ChargeAmount', itemNode);
|
|
153
159
|
const vatPercentage = this.getNumber('ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax/ram:RateApplicablePercent', itemNode);
|
|
154
160
|
// Create item object
|
|
@@ -197,4 +203,4 @@ export class FacturXDecoder extends CIIBaseDecoder {
|
|
|
197
203
|
};
|
|
198
204
|
}
|
|
199
205
|
}
|
|
200
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
206
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdHVyeC5kZWNvZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvZm9ybWF0cy9jaWkvZmFjdHVyeC9mYWN0dXJ4LmRlY29kZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBT25ELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRTdFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGNBQWUsU0FBUSxjQUFjO0lBQ2hEOzs7T0FHRztJQUNPLEtBQUssQ0FBQyxnQkFBZ0I7UUFDOUIsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDOUMsQ0FBQztJQUVEOzs7O09BSUc7SUFDTyxLQUFLLENBQUMsYUFBYSxDQUMzQixpQkFBd0Q7UUFFeEQsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNLLEtBQUssQ0FBQyxpQkFBaUIsQ0FDN0IsaUJBQXVCO1FBRXZCLHFCQUFxQjtRQUNyQixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUNwQyx3REFBd0QsRUFDeEQsb0JBQW9CLENBQ3JCLENBQUM7UUFFRixxQkFBcUI7UUFDckIsTUFBTSxhQUFhLEdBQ2pCLHNGQUFzRixDQUFDO1FBQ3pGLE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxlQUFlLENBQ3ZDLGFBQWEsRUFDYixvQkFBb0IsQ0FDckIsQ0FBQztRQUNGLE1BQU0sZUFBZSxHQUFH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
|
|
@@ -11,7 +11,7 @@ export declare class FacturXEncoder extends CIIBaseEncoder {
|
|
|
11
11
|
*/
|
|
12
12
|
protected encodeCreditNote(creditNote: TCreditNote): Promise<string>;
|
|
13
13
|
/**
|
|
14
|
-
* Encodes an invoice document (invoice, debit note or self-billed invoice) into Factur-X XML
|
|
14
|
+
* Encodes an invoice document (invoice, corrected invoice, debit note or self-billed invoice) into Factur-X XML
|
|
15
15
|
* @param invoice Invoice document to encode
|
|
16
16
|
* @returns Factur-X XML string
|
|
17
17
|
*/
|
|
@@ -29,7 +29,7 @@ export declare class FacturXEncoder extends CIIBaseEncoder {
|
|
|
29
29
|
/**
|
|
30
30
|
* Sets the document type code in the XML document
|
|
31
31
|
* @param doc XML document
|
|
32
|
-
* @param typeCode Document type code (380 invoice, 381 credit note, 383 debit note, 389 self-billed invoice)
|
|
32
|
+
* @param typeCode Document type code (380 invoice, 381 credit note, 383 debit note, 384 corrected invoice, 389 self-billed invoice)
|
|
33
33
|
*/
|
|
34
34
|
private setDocumentTypeCode;
|
|
35
35
|
/**
|
|
@@ -5,6 +5,7 @@ import { Decimal } from '../../utils/decimal.js';
|
|
|
5
5
|
import { DecimalCurrencyCalculator } from '../../utils/currency.calculator.decimal.js';
|
|
6
6
|
import { getCurrencyMinorUnits } from '../../utils/currency.utils.js';
|
|
7
7
|
import { getDocumentTypeCode } from '../../utils/document.typecode.js';
|
|
8
|
+
import { getWritableDate } from '../../utils/date.value.js';
|
|
8
9
|
/**
|
|
9
10
|
* Encoder for Factur-X invoice format
|
|
10
11
|
*/
|
|
@@ -25,14 +26,14 @@ export class FacturXEncoder extends CIIBaseEncoder {
|
|
|
25
26
|
return new XMLSerializer().serializeToString(xmlDoc);
|
|
26
27
|
}
|
|
27
28
|
/**
|
|
28
|
-
* Encodes an invoice document (invoice, debit note or self-billed invoice) into Factur-X XML
|
|
29
|
+
* Encodes an invoice document (invoice, corrected invoice, debit note or self-billed invoice) into Factur-X XML
|
|
29
30
|
* @param invoice Invoice document to encode
|
|
30
31
|
* @returns Factur-X XML string
|
|
31
32
|
*/
|
|
32
33
|
async encodeInvoice(invoice) {
|
|
33
34
|
// Create base XML
|
|
34
35
|
const xmlDoc = this.createBaseXml();
|
|
35
|
-
// Set document type code (380 invoice, 383 debit note, 389 self-billed invoice)
|
|
36
|
+
// Set document type code (380 invoice, 383 debit note, 384 corrected invoice, 389 self-billed invoice)
|
|
36
37
|
this.setDocumentTypeCode(xmlDoc, getDocumentTypeCode(invoice.accountingDocType));
|
|
37
38
|
// Add common invoice data
|
|
38
39
|
this.addCommonInvoiceData(xmlDoc, invoice);
|
|
@@ -83,7 +84,7 @@ export class FacturXEncoder extends CIIBaseEncoder {
|
|
|
83
84
|
/**
|
|
84
85
|
* Sets the document type code in the XML document
|
|
85
86
|
* @param doc XML document
|
|
86
|
-
* @param typeCode Document type code (380 invoice, 381 credit note, 383 debit note, 389 self-billed invoice)
|
|
87
|
+
* @param typeCode Document type code (380 invoice, 381 credit note, 383 debit note, 384 corrected invoice, 389 self-billed invoice)
|
|
87
88
|
*/
|
|
88
89
|
setDocumentTypeCode(doc, typeCode) {
|
|
89
90
|
// Get root element
|
|
@@ -121,7 +122,7 @@ export class FacturXEncoder extends CIIBaseEncoder {
|
|
|
121
122
|
const issueDateElement = doc.createElement('ram:IssueDateTime');
|
|
122
123
|
const dateStringElement = doc.createElement('udt:DateTimeString');
|
|
123
124
|
dateStringElement.setAttribute('format', '102'); // YYYYMMDD format
|
|
124
|
-
dateStringElement.textContent = this.formatDateYYYYMMDD(invoice.date);
|
|
125
|
+
dateStringElement.textContent = this.formatDateYYYYMMDD(invoice.date, 'BT-2 invoice issue date');
|
|
125
126
|
issueDateElement.appendChild(dateStringElement);
|
|
126
127
|
documentElement.appendChild(issueDateElement);
|
|
127
128
|
// Add notes - include subject as first note if it exists
|
|
@@ -152,6 +153,8 @@ export class FacturXEncoder extends CIIBaseEncoder {
|
|
|
152
153
|
this.addDeliverySection(doc, transactionElement, invoice);
|
|
153
154
|
// Add settlement section with payment terms and totals
|
|
154
155
|
this.addSettlementSection(doc, transactionElement, invoice);
|
|
156
|
+
// Add the preceding invoice references (BG-3) the document states
|
|
157
|
+
this.addPrecedingInvoiceReferences(doc, invoice);
|
|
155
158
|
// Add line items
|
|
156
159
|
this.addLineItems(doc, transactionElement, invoice);
|
|
157
160
|
}
|
|
@@ -238,12 +241,12 @@ export class FacturXEncoder extends CIIBaseEncoder {
|
|
|
238
241
|
const deliveryElement = doc.createElement('ram:ApplicableHeaderTradeDelivery');
|
|
239
242
|
transactionElement.appendChild(deliveryElement);
|
|
240
243
|
// Add delivery date if available
|
|
241
|
-
if (invoice.deliveryDate) {
|
|
244
|
+
if (invoice.deliveryDate !== undefined) {
|
|
242
245
|
const deliveryDateElement = doc.createElement('ram:ActualDeliverySupplyChainEvent');
|
|
243
246
|
const occurrenceDateElement = doc.createElement('ram:OccurrenceDateTime');
|
|
244
247
|
const dateStringElement = doc.createElement('udt:DateTimeString');
|
|
245
248
|
dateStringElement.setAttribute('format', '102'); // YYYYMMDD format
|
|
246
|
-
dateStringElement.textContent = this.formatDateYYYYMMDD(invoice.deliveryDate);
|
|
249
|
+
dateStringElement.textContent = this.formatDateYYYYMMDD(invoice.deliveryDate, 'BT-72 actual delivery date');
|
|
247
250
|
occurrenceDateElement.appendChild(dateStringElement);
|
|
248
251
|
deliveryDateElement.appendChild(occurrenceDateElement);
|
|
249
252
|
deliveryElement.appendChild(deliveryDateElement);
|
|
@@ -272,7 +275,7 @@ export class FacturXEncoder extends CIIBaseEncoder {
|
|
|
272
275
|
// Calculate due date
|
|
273
276
|
const dueDate = new Date(invoice.date);
|
|
274
277
|
dueDate.setDate(dueDate.getDate() + invoice.dueInDays);
|
|
275
|
-
dateStringElement.textContent = this.formatDateYYYYMMDD(dueDate.getTime());
|
|
278
|
+
dateStringElement.textContent = this.formatDateYYYYMMDD(dueDate.getTime(), 'BT-9 payment due date');
|
|
276
279
|
dueDateElement.appendChild(dateStringElement);
|
|
277
280
|
paymentTermsElement.appendChild(dueDateElement);
|
|
278
281
|
settlementElement.appendChild(paymentTermsElement);
|
|
@@ -359,7 +362,10 @@ export class FacturXEncoder extends CIIBaseEncoder {
|
|
|
359
362
|
const deliveryElement = doc.createElement('ram:SpecifiedLineTradeDelivery');
|
|
360
363
|
const quantityElement = doc.createElement('ram:BilledQuantity');
|
|
361
364
|
quantityElement.textContent = item.unitQuantity.toString();
|
|
362
|
-
|
|
365
|
+
// a line without a unit is written without one, so that BR-23 reports it
|
|
366
|
+
if (item.unitType) {
|
|
367
|
+
quantityElement.setAttribute('unitCode', item.unitType);
|
|
368
|
+
}
|
|
363
369
|
deliveryElement.appendChild(quantityElement);
|
|
364
370
|
lineItemElement.appendChild(deliveryElement);
|
|
365
371
|
// Add settlement information (tax)
|
|
@@ -399,12 +405,12 @@ export class FacturXEncoder extends CIIBaseEncoder {
|
|
|
399
405
|
* @param timestamp Timestamp to format
|
|
400
406
|
* @returns Formatted date string
|
|
401
407
|
*/
|
|
402
|
-
formatDateYYYYMMDD(timestamp) {
|
|
403
|
-
const date =
|
|
408
|
+
formatDateYYYYMMDD(timestamp, field) {
|
|
409
|
+
const date = getWritableDate(timestamp, field, 'cii');
|
|
404
410
|
const year = date.getFullYear();
|
|
405
411
|
const month = (date.getMonth() + 1).toString().padStart(2, '0');
|
|
406
412
|
const day = date.getDate().toString().padStart(2, '0');
|
|
407
413
|
return `${year}${month}${day}`;
|
|
408
414
|
}
|
|
409
415
|
}
|
|
410
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"facturx.encoder.js","sourceRoot":"","sources":["../../../../ts/formats/cii/facturx/facturx.encoder.ts"],"names":[],"mappings":"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"}
|
|
416
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"facturx.encoder.js","sourceRoot":"","sources":["../../../../ts/formats/cii/facturx/facturx.encoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,20 +20,20 @@ export class FacturXValidator extends CIIBaseValidator {
|
|
|
20
20
|
'rsm:SupplyChainTradeTransaction'
|
|
21
21
|
];
|
|
22
22
|
for (const section of sections) {
|
|
23
|
-
if (!this.exists(section)) {
|
|
23
|
+
if (!this.exists(`/rsm:CrossIndustryInvoice/${section}`)) {
|
|
24
24
|
this.addError('FX-STRUCT-1', `Required section ${section} is missing`, '/rsm:CrossIndustryInvoice');
|
|
25
25
|
valid = false;
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
// Check for SupplyChainTradeTransaction sections
|
|
29
|
-
if (this.exists('rsm:SupplyChainTradeTransaction')) {
|
|
29
|
+
if (this.exists('/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction')) {
|
|
30
30
|
const tradeSubsections = [
|
|
31
31
|
'ram:ApplicableHeaderTradeAgreement',
|
|
32
32
|
'ram:ApplicableHeaderTradeDelivery',
|
|
33
33
|
'ram:ApplicableHeaderTradeSettlement'
|
|
34
34
|
];
|
|
35
35
|
for (const subsection of tradeSubsections) {
|
|
36
|
-
if (!this.exists(
|
|
36
|
+
if (!this.exists(`/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/${subsection}`)) {
|
|
37
37
|
this.addError('FX-STRUCT-2', `Required subsection ${subsection} is missing`, '/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction');
|
|
38
38
|
valid = false;
|
|
39
39
|
}
|
|
@@ -57,6 +57,10 @@ export class FacturXValidator extends CIIBaseValidator {
|
|
|
57
57
|
// shall contain the Seller VAT Identifier (BT-31), the Seller tax registration identifier (BT-32)
|
|
58
58
|
// and/or the Seller tax representative VAT identifier (BT-63).
|
|
59
59
|
valid = this.validateSellerVatIdentifier() && valid;
|
|
60
|
+
// BR-23: every line has a unit code
|
|
61
|
+
valid = this.validateLineUnitCodePresence() && valid;
|
|
62
|
+
// BR-CL-23: unit codes of UN/ECE Recommendation 20 with the Recommendation 21 extension
|
|
63
|
+
valid = this.validateUnitCodes() && valid;
|
|
60
64
|
return valid;
|
|
61
65
|
}
|
|
62
66
|
/**
|
|
@@ -135,4 +139,4 @@ export class FacturXValidator extends CIIBaseValidator {
|
|
|
135
139
|
}
|
|
136
140
|
}
|
|
137
141
|
}
|
|
138
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
142
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdHVyeC52YWxpZGF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90cy9mb3JtYXRzL2NpaS9mYWN0dXJ4L2ZhY3R1cngudmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRTs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsZ0JBQWdCO0lBQ3BEOzs7T0FHRztJQUNPLGlCQUFpQjtRQUN6QixJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUc7WUFBRSxPQUFPLEtBQUssQ0FBQztRQUU1QixJQUFJLEtBQUssR0FBRyxJQUFJLENBQUM7UUFFakIsbUNBQW1DO1FBQ25DLE1BQU0sUUFBUSxHQUFHO1lBQ2YsOEJBQThCO1lBQzlCLHVCQUF1QjtZQUN2QixpQ0FBaUM7U0FDbEMsQ0FBQztRQUVGLEtBQUssTUFBTSxPQUFPLElBQUksUUFBUSxFQUFFLENBQUM7WUFDL0IsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsNkJBQTZCLE9BQU8sRUFBRSxDQUFDLEVBQUUsQ0FBQztnQkFDekQsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsb0JBQW9CLE9BQU8sYUFBYSxFQUFFLDJCQUEyQixDQUFDLENBQUM7Z0JBQ3BHLEtBQUssR0FBRyxLQUFLLENBQUM7WUFDaEIsQ0FBQztRQUNILENBQUM7UUFFRCxpREFBaUQ7UUFDakQsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLDJEQUEyRCxDQUFDLEVBQUUsQ0FBQztZQUM3RSxNQUFNLGdCQUFnQixHQUFHO2dCQUN2QixvQ0FBb0M7Z0JBQ3BDLG1DQUFtQztnQkFDbkMscUNBQXFDO2FBQ3RDLENBQUM7WUFFRixLQUFLLE1BQU0sVUFBVSxJQUFJLGdCQUFnQixFQUFFLENBQUM7Z0JBQzFDLElB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
|
|
@@ -10,7 +10,7 @@ export declare class ZUGFeRDDecoder extends CIIBaseDecoder {
|
|
|
10
10
|
*/
|
|
11
11
|
protected decodeCreditNote(): Promise<TCreditNote>;
|
|
12
12
|
/**
|
|
13
|
-
* Decodes a ZUGFeRD invoice document: an invoice, a debit note or a self-billed invoice
|
|
13
|
+
* Decodes a ZUGFeRD invoice document: an invoice, a corrected invoice, a debit note or a self-billed invoice
|
|
14
14
|
* @param accountingDocType The type the document type code stands for
|
|
15
15
|
* @returns Promise resolving to the invoice document
|
|
16
16
|
*/
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CIIBaseDecoder } from '../cii.decoder.js';
|
|
2
2
|
import { business, finance } from '../../../plugins.js';
|
|
3
3
|
import { EN16931Validator } from '../../validation/en16931.validator.js';
|
|
4
|
+
import { getPrecedingInvoiceFields } from '../../utils/preceding.invoice.js';
|
|
4
5
|
/**
|
|
5
6
|
* Decoder for ZUGFeRD invoice format
|
|
6
7
|
*/
|
|
@@ -13,7 +14,7 @@ export class ZUGFeRDDecoder extends CIIBaseDecoder {
|
|
|
13
14
|
return this.extractCommonData('creditnote');
|
|
14
15
|
}
|
|
15
16
|
/**
|
|
16
|
-
* Decodes a ZUGFeRD invoice document: an invoice, a debit note or a self-billed invoice
|
|
17
|
+
* Decodes a ZUGFeRD invoice document: an invoice, a corrected invoice, a debit note or a self-billed invoice
|
|
17
18
|
* @param accountingDocType The type the document type code stands for
|
|
18
19
|
* @returns Promise resolving to the invoice document
|
|
19
20
|
*/
|
|
@@ -59,6 +60,8 @@ export class ZUGFeRDDecoder extends CIIBaseDecoder {
|
|
|
59
60
|
subject = allNotes[0];
|
|
60
61
|
notes = allNotes.slice(1); // Remove subject from notes
|
|
61
62
|
}
|
|
63
|
+
// Extract the actual delivery date, if stated
|
|
64
|
+
const deliveryDate = this.extractDeliveryDate();
|
|
62
65
|
// Check for reverse charge
|
|
63
66
|
const reverseCharge = this.exists('//ram:SpecifiedTradeAllowanceCharge/ram:ReasonCode[text()="62"]');
|
|
64
67
|
// Create the common invoice data
|
|
@@ -85,8 +88,10 @@ export class ZUGFeRDDecoder extends CIIBaseDecoder {
|
|
|
85
88
|
reverseCharge: reverseCharge,
|
|
86
89
|
currency: currencyCode,
|
|
87
90
|
notes: notes,
|
|
88
|
-
|
|
89
|
-
|
|
91
|
+
// the day of supply as the document states it (BT-72)
|
|
92
|
+
...(deliveryDate === undefined ? {} : { deliveryDate }),
|
|
93
|
+
objectActions: [],
|
|
94
|
+
...getPrecedingInvoiceFields(accountingDocType, this.extractPrecedingInvoiceReferences()),
|
|
90
95
|
};
|
|
91
96
|
// Validate mandatory EN16931 fields unless validation is skipped
|
|
92
97
|
if (!this.skipValidation) {
|
|
@@ -157,7 +162,8 @@ export class ZUGFeRDDecoder extends CIIBaseDecoder {
|
|
|
157
162
|
const name = this.getText('ram:SpecifiedTradeProduct/ram:Name', itemNode);
|
|
158
163
|
const articleNumber = this.getText('ram:SpecifiedTradeProduct/ram:SellerAssignedID', itemNode);
|
|
159
164
|
const unitQuantity = this.getNumber('ram:SpecifiedLineTradeDelivery/ram:BilledQuantity', itemNode);
|
|
160
|
-
|
|
165
|
+
// an absent unit code (BT-130) stays absent, so that BR-23 reports it
|
|
166
|
+
const unitType = this.getText('ram:SpecifiedLineTradeDelivery/ram:BilledQuantity/@unitCode', itemNode);
|
|
161
167
|
const unitNetPrice = this.getNumber('ram:SpecifiedLineTradeAgreement/ram:NetPriceProductTradePrice/ram:ChargeAmount', itemNode);
|
|
162
168
|
const vatPercentage = this.getNumber('ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax/ram:RateApplicablePercent', itemNode);
|
|
163
169
|
// Create item object
|
|
@@ -207,4 +213,4 @@ export class ZUGFeRDDecoder extends CIIBaseDecoder {
|
|
|
207
213
|
};
|
|
208
214
|
}
|
|
209
215
|
}
|
|
210
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
216
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoienVnZmVyZC5kZWNvZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvZm9ybWF0cy9jaWkvenVnZmVyZC96dWdmZXJkLmRlY29kZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBT25ELE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDeEQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDekUsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFN0U7O0dBRUc7QUFDSCxNQUFNLE9BQU8sY0FBZSxTQUFRLGNBQWM7SUFDaEQ7OztPQUdHO0lBQ08sS0FBSyxDQUFDLGdCQUFnQjtRQUM5QixPQUFPLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNPLEtBQUssQ0FBQyxhQUFhLENBQzNCLGlCQUF3RDtRQUV4RCxPQUFPLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ25ELENBQUM7SUFFRDs7OztPQUlHO0lBQ0ssS0FBSyxDQUFDLGlCQUFpQixDQUM3QixpQkFBdUI7UUFFdkIscUJBQXFCO1FBQ3JCLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsZ0NBQWdDLENBQUMsQ0FBQztRQUVqRSxxQkFBcUI7UUFDckIsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyx3Q0FBd0MsQ0FBQyxDQUFDO1FBQzVFLE1BQU0sZUFBZSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsZ0RBQWdELENBQUMsQ0FBQztRQUN2RixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLFlBQVksRUFBRSxlQUFlLENBQUMsQ0FBQztRQUVuRSw2QkFB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
|
|
@@ -12,7 +12,7 @@ export declare class ZUGFeRDEncoder extends CIIBaseEncoder {
|
|
|
12
12
|
*/
|
|
13
13
|
protected encodeCreditNote(creditNote: TCreditNote): Promise<string>;
|
|
14
14
|
/**
|
|
15
|
-
* Encodes an invoice document (invoice, debit note or self-billed invoice) into ZUGFeRD XML
|
|
15
|
+
* Encodes an invoice document (invoice, corrected invoice, debit note or self-billed invoice) into ZUGFeRD XML
|
|
16
16
|
* @param invoice Invoice document to encode
|
|
17
17
|
* @returns ZUGFeRD XML string
|
|
18
18
|
*/
|