@fin.cx/einvoice 8.1.0 → 8.2.1
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 +17 -2
- package/dist_ts/formats/base/base.decoder.js +4 -3
- package/dist_ts/formats/base/base.encoder.d.ts +1 -1
- package/dist_ts/formats/cii/cii.decoder.d.ts +27 -1
- package/dist_ts/formats/cii/cii.decoder.js +61 -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/facturx/facturx.decoder.d.ts +1 -1
- package/dist_ts/formats/cii/facturx/facturx.decoder.js +11 -8
- package/dist_ts/formats/cii/facturx/facturx.encoder.d.ts +2 -2
- package/dist_ts/formats/cii/facturx/facturx.encoder.js +18 -15
- package/dist_ts/formats/cii/zugferd/zugferd.decoder.d.ts +1 -1
- package/dist_ts/formats/cii/zugferd/zugferd.decoder.js +12 -10
- package/dist_ts/formats/cii/zugferd/zugferd.encoder.d.ts +1 -1
- package/dist_ts/formats/cii/zugferd/zugferd.encoder.js +26 -19
- package/dist_ts/formats/cii/zugferd/zugferd.v1.decoder.d.ts +19 -1
- package/dist_ts/formats/cii/zugferd/zugferd.v1.decoder.js +51 -10
- package/dist_ts/formats/ubl/generic/ubl.encoder.d.ts +23 -1
- package/dist_ts/formats/ubl/generic/ubl.encoder.js +69 -14
- 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.types.d.ts +6 -0
- package/dist_ts/formats/ubl/ubl.types.js +9 -3
- package/dist_ts/formats/ubl/xrechnung/xrechnung.decoder.d.ts +6 -1
- package/dist_ts/formats/ubl/xrechnung/xrechnung.decoder.js +46 -14
- package/dist_ts/formats/ubl/xrechnung/xrechnung.encoder.d.ts +1 -1
- package/dist_ts/formats/ubl/xrechnung/xrechnung.encoder.js +7 -12
- package/dist_ts/formats/utils/date.value.d.ts +28 -0
- package/dist_ts/formats/utils/date.value.js +50 -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/format.detector.js +6 -4
- package/dist_ts/formats/utils/payment.terms.d.ts +18 -0
- package/dist_ts/formats/utils/payment.terms.js +32 -0
- 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/validation/integrated.validator.js +6 -3
- package/dist_ts/formats/validation/xrechnung.validator.js +6 -4
- package/dist_ts/index.d.ts +1 -1
- package/dist_ts/index.js +1 -1
- package/dist_ts/interfaces/common.d.ts +6 -2
- package/package.json +3 -3
- package/readme.md +77 -10
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/einvoice.ts +18 -1
- package/ts/formats/base/base.decoder.ts +3 -2
- package/ts/formats/base/base.encoder.ts +1 -1
- package/ts/formats/cii/cii.decoder.ts +74 -1
- package/ts/formats/cii/cii.encoder.ts +62 -6
- package/ts/formats/cii/cii.types.ts +2 -1
- package/ts/formats/cii/facturx/facturx.decoder.ts +11 -7
- package/ts/formats/cii/facturx/facturx.encoder.ts +18 -14
- package/ts/formats/cii/zugferd/zugferd.decoder.ts +12 -9
- package/ts/formats/cii/zugferd/zugferd.encoder.ts +26 -18
- package/ts/formats/cii/zugferd/zugferd.v1.decoder.ts +58 -9
- package/ts/formats/ubl/generic/ubl.encoder.ts +76 -13
- package/ts/formats/ubl/ubl.decoder.ts +1 -1
- package/ts/formats/ubl/ubl.encoder.ts +77 -13
- package/ts/formats/ubl/ubl.types.ts +8 -2
- package/ts/formats/ubl/xrechnung/xrechnung.decoder.ts +56 -13
- package/ts/formats/ubl/xrechnung/xrechnung.encoder.ts +7 -12
- package/ts/formats/utils/date.value.ts +52 -0
- package/ts/formats/utils/document.typecode.ts +7 -3
- package/ts/formats/utils/format.detector.ts +5 -5
- package/ts/formats/utils/payment.terms.ts +37 -0
- package/ts/formats/utils/preceding.invoice.ts +74 -0
- package/ts/formats/validation/integrated.validator.ts +5 -2
- package/ts/formats/validation/xrechnung.validator.ts +5 -3
- package/ts/index.ts +3 -0
- package/ts/interfaces/common.ts +6 -1
|
@@ -3,6 +3,8 @@ import { ZUGFERD_PROFILE_IDS } from './zugferd.types.js';
|
|
|
3
3
|
import { CIIProfile } from '../cii.types.js';
|
|
4
4
|
import { DOMParser, XMLSerializer } from '../../../plugins.js';
|
|
5
5
|
import { getDocumentTypeCode } from '../../utils/document.typecode.js';
|
|
6
|
+
import { getWritableDate, getWritableDueDate } from '../../utils/date.value.js';
|
|
7
|
+
import { getPaymentTermsNote } from '../../utils/payment.terms.js';
|
|
6
8
|
/**
|
|
7
9
|
* Encoder for ZUGFeRD invoice format
|
|
8
10
|
*/
|
|
@@ -28,14 +30,14 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
|
|
|
28
30
|
return new XMLSerializer().serializeToString(xmlDoc);
|
|
29
31
|
}
|
|
30
32
|
/**
|
|
31
|
-
* Encodes an invoice document (invoice, debit note or self-billed invoice) into ZUGFeRD XML
|
|
33
|
+
* Encodes an invoice document (invoice, corrected invoice, debit note or self-billed invoice) into ZUGFeRD XML
|
|
32
34
|
* @param invoice Invoice document to encode
|
|
33
35
|
* @returns ZUGFeRD XML string
|
|
34
36
|
*/
|
|
35
37
|
async encodeInvoice(invoice) {
|
|
36
38
|
// Create base XML
|
|
37
39
|
const xmlDoc = this.createBaseXml();
|
|
38
|
-
// Set document type code (380 invoice, 383 debit note, 389 self-billed invoice)
|
|
40
|
+
// Set document type code (380 invoice, 383 debit note, 384 corrected invoice, 389 self-billed invoice)
|
|
39
41
|
this.setDocumentTypeCode(xmlDoc, getDocumentTypeCode(invoice.accountingDocType));
|
|
40
42
|
// Add common invoice data
|
|
41
43
|
this.addCommonInvoiceData(xmlDoc, invoice);
|
|
@@ -124,7 +126,7 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
|
|
|
124
126
|
const issueDateElement = doc.createElement('ram:IssueDateTime');
|
|
125
127
|
const dateStringElement = doc.createElement('udt:DateTimeString');
|
|
126
128
|
dateStringElement.setAttribute('format', '102'); // YYYYMMDD format
|
|
127
|
-
dateStringElement.textContent = this.formatDateYYYYMMDD(invoice.date);
|
|
129
|
+
dateStringElement.textContent = this.formatDateYYYYMMDD(invoice.date, 'BT-2 invoice issue date');
|
|
128
130
|
issueDateElement.appendChild(dateStringElement);
|
|
129
131
|
documentElement.appendChild(issueDateElement);
|
|
130
132
|
// Add notes - include subject as first note if it exists
|
|
@@ -155,6 +157,8 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
|
|
|
155
157
|
this.addDeliverySection(doc, transactionElement, invoice);
|
|
156
158
|
// Add settlement section with payment terms and totals
|
|
157
159
|
this.addSettlementSection(doc, transactionElement, invoice);
|
|
160
|
+
// Add the preceding invoice references (BG-3) the document states
|
|
161
|
+
this.addPrecedingInvoiceReferences(doc, invoice);
|
|
158
162
|
// Add line items
|
|
159
163
|
this.addLineItems(doc, transactionElement, invoice);
|
|
160
164
|
}
|
|
@@ -266,12 +270,12 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
|
|
|
266
270
|
const deliveryElement = doc.createElement('ram:ApplicableHeaderTradeDelivery');
|
|
267
271
|
transactionElement.appendChild(deliveryElement);
|
|
268
272
|
// Add delivery date if available
|
|
269
|
-
if (invoice.deliveryDate) {
|
|
273
|
+
if (invoice.deliveryDate !== undefined) {
|
|
270
274
|
const deliveryDateElement = doc.createElement('ram:ActualDeliverySupplyChainEvent');
|
|
271
275
|
const occurrenceDateElement = doc.createElement('ram:OccurrenceDateTime');
|
|
272
276
|
const dateStringElement = doc.createElement('udt:DateTimeString');
|
|
273
277
|
dateStringElement.setAttribute('format', '102'); // YYYYMMDD format
|
|
274
|
-
dateStringElement.textContent = this.formatDateYYYYMMDD(invoice.deliveryDate);
|
|
278
|
+
dateStringElement.textContent = this.formatDateYYYYMMDD(invoice.deliveryDate, 'BT-72 actual delivery date');
|
|
275
279
|
occurrenceDateElement.appendChild(dateStringElement);
|
|
276
280
|
deliveryDateElement.appendChild(occurrenceDateElement);
|
|
277
281
|
deliveryElement.appendChild(deliveryDateElement);
|
|
@@ -280,20 +284,20 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
|
|
|
280
284
|
if (invoice.periodOfPerformance) {
|
|
281
285
|
const periodElement = doc.createElement('ram:BillingSpecifiedPeriod');
|
|
282
286
|
// Start date
|
|
283
|
-
if (invoice.periodOfPerformance.from) {
|
|
287
|
+
if (invoice.periodOfPerformance.from !== undefined) {
|
|
284
288
|
const startDateElement = doc.createElement('ram:StartDateTime');
|
|
285
289
|
const startDateStringElement = doc.createElement('udt:DateTimeString');
|
|
286
290
|
startDateStringElement.setAttribute('format', '102'); // YYYYMMDD format
|
|
287
|
-
startDateStringElement.textContent = this.formatDateYYYYMMDD(invoice.periodOfPerformance.from);
|
|
291
|
+
startDateStringElement.textContent = this.formatDateYYYYMMDD(invoice.periodOfPerformance.from, 'BT-73 invoicing period start date');
|
|
288
292
|
startDateElement.appendChild(startDateStringElement);
|
|
289
293
|
periodElement.appendChild(startDateElement);
|
|
290
294
|
}
|
|
291
295
|
// End date
|
|
292
|
-
if (invoice.periodOfPerformance.to) {
|
|
296
|
+
if (invoice.periodOfPerformance.to !== undefined) {
|
|
293
297
|
const endDateElement = doc.createElement('ram:EndDateTime');
|
|
294
298
|
const endDateStringElement = doc.createElement('udt:DateTimeString');
|
|
295
299
|
endDateStringElement.setAttribute('format', '102'); // YYYYMMDD format
|
|
296
|
-
endDateStringElement.textContent = this.formatDateYYYYMMDD(invoice.periodOfPerformance.to);
|
|
300
|
+
endDateStringElement.textContent = this.formatDateYYYYMMDD(invoice.periodOfPerformance.to, 'BT-74 invoicing period end date');
|
|
297
301
|
endDateElement.appendChild(endDateStringElement);
|
|
298
302
|
periodElement.appendChild(endDateElement);
|
|
299
303
|
}
|
|
@@ -320,7 +324,10 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
|
|
|
320
324
|
if (invoice.paymentOptions) {
|
|
321
325
|
// Add payment instructions as description - this is generic enough to work with any payment type
|
|
322
326
|
const descriptionElement = doc.createElement('ram:Description');
|
|
323
|
-
descriptionElement.textContent =
|
|
327
|
+
descriptionElement.textContent = [
|
|
328
|
+
getPaymentTermsNote(invoice.date, invoice.dueInDays, invoice.language, 'cii'),
|
|
329
|
+
invoice.paymentOptions.description,
|
|
330
|
+
].filter(Boolean).join('. ');
|
|
324
331
|
paymentTermsElement.appendChild(descriptionElement);
|
|
325
332
|
}
|
|
326
333
|
// Add due date
|
|
@@ -328,9 +335,8 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
|
|
|
328
335
|
const dateStringElement = doc.createElement('udt:DateTimeString');
|
|
329
336
|
dateStringElement.setAttribute('format', '102'); // YYYYMMDD format
|
|
330
337
|
// Calculate due date
|
|
331
|
-
const dueDate =
|
|
332
|
-
|
|
333
|
-
dateStringElement.textContent = this.formatDateYYYYMMDD(dueDate.getTime());
|
|
338
|
+
const dueDate = getWritableDueDate(invoice.date, invoice.dueInDays, 'cii');
|
|
339
|
+
dateStringElement.textContent = this.formatDateYYYYMMDD(dueDate.getTime(), 'BT-9 payment due date');
|
|
334
340
|
dueDateElement.appendChild(dateStringElement);
|
|
335
341
|
paymentTermsElement.appendChild(dueDateElement);
|
|
336
342
|
settlementElement.appendChild(paymentTermsElement);
|
|
@@ -543,12 +549,13 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
|
|
|
543
549
|
* @param timestamp Timestamp to format
|
|
544
550
|
* @returns Formatted date string
|
|
545
551
|
*/
|
|
546
|
-
formatDateYYYYMMDD(timestamp) {
|
|
547
|
-
const date =
|
|
548
|
-
|
|
549
|
-
const
|
|
550
|
-
const
|
|
552
|
+
formatDateYYYYMMDD(timestamp, field) {
|
|
553
|
+
const date = getWritableDate(timestamp, field, 'cii');
|
|
554
|
+
// the UTC fields: a calendar day is its UTC midnight, whatever the server's zone
|
|
555
|
+
const year = date.getUTCFullYear();
|
|
556
|
+
const month = (date.getUTCMonth() + 1).toString().padStart(2, '0');
|
|
557
|
+
const day = date.getUTCDate().toString().padStart(2, '0');
|
|
551
558
|
return `${year}${month}${day}`;
|
|
552
559
|
}
|
|
553
560
|
}
|
|
554
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"zugferd.encoder.js","sourceRoot":"","sources":["../../../../ts/formats/cii/zugferd/zugferd.encoder.ts"],"names":[],"mappings":"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"}
|
|
561
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"zugferd.encoder.js","sourceRoot":"","sources":["../../../../ts/formats/cii/zugferd/zugferd.encoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,13 +10,31 @@ export declare class ZUGFeRDV1Decoder extends CIIBaseDecoder {
|
|
|
10
10
|
* @param skipValidation Whether to skip EN16931 validation
|
|
11
11
|
*/
|
|
12
12
|
constructor(xml: string, skipValidation?: boolean);
|
|
13
|
+
/**
|
|
14
|
+
* Reads the issue date of the v1 header (`rsm:HeaderExchangedDocument`); a
|
|
15
|
+
* missing or invalid one is refused with an `EInvoiceParsingError`.
|
|
16
|
+
*/
|
|
17
|
+
protected extractIssueDate(): number;
|
|
18
|
+
/**
|
|
19
|
+
* Reads the payment due date of the v1 header payment terms; undefined when
|
|
20
|
+
* the document states none.
|
|
21
|
+
*/
|
|
22
|
+
protected extractDueDate(): number | undefined;
|
|
23
|
+
/** The trimmed text of the first node a v1 path selects, or '' */
|
|
24
|
+
private v1Text;
|
|
25
|
+
/**
|
|
26
|
+
* Reads the actual delivery date of the v1 header delivery
|
|
27
|
+
* (`ram:ApplicableSupplyChainTradeDelivery`); undefined when the document
|
|
28
|
+
* does not state one.
|
|
29
|
+
*/
|
|
30
|
+
protected extractDeliveryDate(): number | undefined;
|
|
13
31
|
/**
|
|
14
32
|
* Decodes a ZUGFeRD v1 credit note
|
|
15
33
|
* @returns Promise resolving to a TCreditNote object
|
|
16
34
|
*/
|
|
17
35
|
protected decodeCreditNote(): Promise<TCreditNote>;
|
|
18
36
|
/**
|
|
19
|
-
* Decodes a ZUGFeRD v1 invoice document: an invoice, a debit note or a self-billed invoice
|
|
37
|
+
* Decodes a ZUGFeRD v1 invoice document: an invoice, a corrected invoice, a debit note or a self-billed invoice
|
|
20
38
|
* @param accountingDocType The type the document type code stands for
|
|
21
39
|
* @returns Promise resolving to the invoice document
|
|
22
40
|
*/
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import { CIIBaseDecoder } from '../cii.decoder.js';
|
|
2
2
|
import { ZUGFERD_V1_NAMESPACES } from '../cii.types.js';
|
|
3
|
-
import { business, finance } from '../../../plugins.js';
|
|
3
|
+
import { business, finance, xpath } from '../../../plugins.js';
|
|
4
4
|
import { EN16931Validator } from '../../validation/en16931.validator.js';
|
|
5
|
+
/** XPath selection with the ZUGFeRD v1 namespaces */
|
|
6
|
+
const zugferdV1Select = xpath.useNamespaces({
|
|
7
|
+
rsm: ZUGFERD_V1_NAMESPACES.RSM,
|
|
8
|
+
ram: ZUGFERD_V1_NAMESPACES.RAM,
|
|
9
|
+
udt: ZUGFERD_V1_NAMESPACES.UDT,
|
|
10
|
+
});
|
|
5
11
|
/**
|
|
6
12
|
* Decoder for ZUGFeRD v1 invoice format
|
|
7
13
|
*/
|
|
@@ -20,6 +26,41 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
|
|
|
20
26
|
udt: ZUGFERD_V1_NAMESPACES.UDT
|
|
21
27
|
};
|
|
22
28
|
}
|
|
29
|
+
/**
|
|
30
|
+
* Reads the issue date of the v1 header (`rsm:HeaderExchangedDocument`); a
|
|
31
|
+
* missing or invalid one is refused with an `EInvoiceParsingError`.
|
|
32
|
+
*/
|
|
33
|
+
extractIssueDate() {
|
|
34
|
+
const issueDatePath = '/rsm:CrossIndustryDocument/rsm:HeaderExchangedDocument/ram:IssueDateTime/udt:DateTimeString';
|
|
35
|
+
return this.parseRequiredCIIDate(this.v1Text(issueDatePath), this.v1Text(`${issueDatePath}/@format`));
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Reads the payment due date of the v1 header payment terms; undefined when
|
|
39
|
+
* the document states none.
|
|
40
|
+
*/
|
|
41
|
+
extractDueDate() {
|
|
42
|
+
const dueDatePath = '/rsm:CrossIndustryDocument/rsm:SpecifiedSupplyChainTradeTransaction/ram:ApplicableSupplyChainTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DueDateDateTime/udt:DateTimeString';
|
|
43
|
+
const dueDate = this.v1Text(dueDatePath);
|
|
44
|
+
return dueDate ? this.parseRequiredCIIDate(dueDate, this.v1Text(`${dueDatePath}/@format`)) : undefined;
|
|
45
|
+
}
|
|
46
|
+
/** The trimmed text of the first node a v1 path selects, or '' */
|
|
47
|
+
v1Text(path) {
|
|
48
|
+
return String(zugferdV1Select(`string(${path})`, this.doc)).trim();
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Reads the actual delivery date of the v1 header delivery
|
|
52
|
+
* (`ram:ApplicableSupplyChainTradeDelivery`); undefined when the document
|
|
53
|
+
* does not state one.
|
|
54
|
+
*/
|
|
55
|
+
extractDeliveryDate() {
|
|
56
|
+
const deliveryDatePath = '/rsm:CrossIndustryDocument/rsm:SpecifiedSupplyChainTradeTransaction/ram:ApplicableSupplyChainTradeDelivery/ram:ActualDeliverySupplyChainEvent/ram:OccurrenceDateTime/udt:DateTimeString';
|
|
57
|
+
const deliveryDate = String(zugferdV1Select(`string(${deliveryDatePath})`, this.doc)).trim();
|
|
58
|
+
if (!deliveryDate) {
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
const format = String(zugferdV1Select(`string(${deliveryDatePath}/@format)`, this.doc)).trim();
|
|
62
|
+
return this.parseRequiredCIIDate(deliveryDate, format);
|
|
63
|
+
}
|
|
23
64
|
/**
|
|
24
65
|
* Decodes a ZUGFeRD v1 credit note
|
|
25
66
|
* @returns Promise resolving to a TCreditNote object
|
|
@@ -28,7 +69,7 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
|
|
|
28
69
|
return this.extractCommonData('creditnote');
|
|
29
70
|
}
|
|
30
71
|
/**
|
|
31
|
-
* Decodes a ZUGFeRD v1 invoice document: an invoice, a debit note or a self-billed invoice
|
|
72
|
+
* Decodes a ZUGFeRD v1 invoice document: an invoice, a corrected invoice, a debit note or a self-billed invoice
|
|
32
73
|
* @param accountingDocType The type the document type code stands for
|
|
33
74
|
* @returns Promise resolving to the invoice document
|
|
34
75
|
*/
|
|
@@ -44,9 +85,7 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
|
|
|
44
85
|
// Extract invoice ID
|
|
45
86
|
const invoiceId = this.getText('//ram:ID');
|
|
46
87
|
// Extract issue date
|
|
47
|
-
const
|
|
48
|
-
const issueDateFormat = this.getText('//ram:IssueDateTime/udt:DateTimeString/@format');
|
|
49
|
-
const issueDate = this.parseCIIDate(issueDateStr, issueDateFormat);
|
|
88
|
+
const issueDate = this.extractIssueDate();
|
|
50
89
|
// Extract seller information
|
|
51
90
|
const seller = this.extractParty('//ram:SellerTradeParty');
|
|
52
91
|
// Extract buyer information
|
|
@@ -54,9 +93,8 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
|
|
|
54
93
|
// Extract items
|
|
55
94
|
const items = this.extractItems();
|
|
56
95
|
// Extract due date
|
|
57
|
-
|
|
58
|
-
const
|
|
59
|
-
const dueInDays = Math.round((dueDate - issueDate) / (1000 * 60 * 60 * 24));
|
|
96
|
+
// no due date stated: `dueInDays` cannot express it yet (required field in @tsclass/tsclass); value unchanged: 0 days, what this decoder returned before it read the v1 dates
|
|
97
|
+
const dueInDays = this.dueInDaysOf(issueDate, this.extractDueDate(), 0);
|
|
60
98
|
// Extract currency
|
|
61
99
|
const currencyCode = this.getText('//ram:InvoiceCurrencyCode') || 'EUR';
|
|
62
100
|
// Extract total amount (not used in this implementation but could be useful)
|
|
@@ -74,6 +112,8 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
|
|
|
74
112
|
subject = allNotes[0];
|
|
75
113
|
notes = allNotes.slice(1); // Remove subject from notes
|
|
76
114
|
}
|
|
115
|
+
// Extract the actual delivery date, if stated
|
|
116
|
+
const deliveryDate = this.extractDeliveryDate();
|
|
77
117
|
// Check for reverse charge
|
|
78
118
|
const reverseCharge = this.exists('//ram:SpecifiedTradeAllowanceCharge/ram:ReasonCode[text()="62"]');
|
|
79
119
|
// Create the common invoice data
|
|
@@ -100,7 +140,8 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
|
|
|
100
140
|
reverseCharge: reverseCharge,
|
|
101
141
|
currency: currencyCode,
|
|
102
142
|
notes: notes,
|
|
103
|
-
|
|
143
|
+
// the day of supply as the document states it (BT-72), never the issue date in its place
|
|
144
|
+
...(deliveryDate === undefined ? {} : { deliveryDate }),
|
|
104
145
|
objectActions: []
|
|
105
146
|
};
|
|
106
147
|
return invoiceData;
|
|
@@ -219,4 +260,4 @@ export class ZUGFeRDV1Decoder extends CIIBaseDecoder {
|
|
|
219
260
|
};
|
|
220
261
|
}
|
|
221
262
|
}
|
|
222
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
263
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"zugferd.v1.decoder.js","sourceRoot":"","sources":["../../../../ts/formats/cii/zugferd/zugferd.v1.decoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export declare class UBLEncoder extends UBLBaseEncoder {
|
|
|
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 UBL XML
|
|
15
|
+
* Encodes an invoice document (invoice, corrected invoice, debit note or self-billed invoice) into UBL XML
|
|
16
16
|
* @param invoice Invoice document to encode
|
|
17
17
|
* @returns UBL XML string
|
|
18
18
|
*/
|
|
@@ -24,6 +24,28 @@ export declare class UBLEncoder extends UBLBaseEncoder {
|
|
|
24
24
|
* @param documentType Document type (Invoice or CreditNote)
|
|
25
25
|
*/
|
|
26
26
|
private addCommonElements;
|
|
27
|
+
/**
|
|
28
|
+
* Writes the invoicing period (BG-14: BT-73 and BT-74) the document states.
|
|
29
|
+
* @param doc XML document
|
|
30
|
+
* @param root Document root
|
|
31
|
+
* @param invoice Accounting document
|
|
32
|
+
*/
|
|
33
|
+
private addInvoicePeriod;
|
|
34
|
+
/**
|
|
35
|
+
* Writes one preceding invoice reference (BG-3) per invoice the document
|
|
36
|
+
* states it corrects: the number (BT-25) and, when stated, the issue date (BT-26).
|
|
37
|
+
* @param doc XML document
|
|
38
|
+
* @param root Document root
|
|
39
|
+
* @param invoice Accounting document
|
|
40
|
+
*/
|
|
41
|
+
private addBillingReferences;
|
|
42
|
+
/**
|
|
43
|
+
* Writes the actual delivery date (BT-72) the document states.
|
|
44
|
+
* @param doc XML document
|
|
45
|
+
* @param root Document root
|
|
46
|
+
* @param invoice Accounting document
|
|
47
|
+
*/
|
|
48
|
+
private addDelivery;
|
|
27
49
|
/**
|
|
28
50
|
* Adds credit note specific data to the document
|
|
29
51
|
* @param doc XML document
|