louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only add as tender reference in cii if typecode=50

Browse Source
This commit is contained in:
jstaerk
2025-10-21 09:57:10 +02:00
parent 742fd1df21
commit 517d210e00
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
View File

@@ -686,7 +686,6 @@ public class ZUGFeRDInvoiceImporter {
String sellerOrderIssuerAssignedID = null; String sellerOrderIssuerAssignedID = null;
String additionalReferencedDocument = null; String additionalReferencedDocument = null;
Date additionalReferencedDocumentDate = null; Date additionalReferencedDocumentDate = null;
int typeC = 0;
for (int i = 0; i < headerTradeAgreementNodes.getLength(); i++) { for (int i = 0; i < headerTradeAgreementNodes.getLength(); i++) {
// XMLTools.trimOrNull(nodes.item(i)))) { // XMLTools.trimOrNull(nodes.item(i)))) {
@@ -713,6 +712,9 @@ public class ZUGFeRDInvoiceImporter {
} }
} }
} }
int typeC = 0;
additionalReferencedDocument=null;
additionalReferencedDocumentDate=null;
//Reading BT-17 //Reading BT-17
if (headerTradeAgreementChilds.item(agreementChildIndex).getLocalName().equals("AdditionalReferencedDocument")) { if (headerTradeAgreementChilds.item(agreementChildIndex).getLocalName().equals("AdditionalReferencedDocument")) {
NodeList additionalChilds = headerTradeAgreementChilds.item(agreementChildIndex).getChildNodes(); NodeList additionalChilds = headerTradeAgreementChilds.item(agreementChildIndex).getChildNodes();
@@ -722,7 +724,7 @@ public class ZUGFeRDInvoiceImporter {
&& additionalChilds.item(additionalChildIndex).getLocalName().equals("TypeCode")) { && additionalChilds.item(additionalChildIndex).getLocalName().equals("TypeCode")) {
typeC = Integer.parseInt(XMLTools.trimOrNull(additionalChilds.item(additionalChildIndex))); typeC = Integer.parseInt(XMLTools.trimOrNull(additionalChilds.item(additionalChildIndex)));
} }
if (typeC == 50) {
if ((additionalChilds.item(additionalChildIndex).getLocalName() != null) if ((additionalChilds.item(additionalChildIndex).getLocalName() != null)
&& (additionalChilds.item(additionalChildIndex).getLocalName().equals("IssuerAssignedID"))) { && (additionalChilds.item(additionalChildIndex).getLocalName().equals("IssuerAssignedID"))) {
additionalReferencedDocument = XMLTools.trimOrNull(additionalChilds.item(additionalChildIndex)); additionalReferencedDocument = XMLTools.trimOrNull(additionalChilds.item(additionalChildIndex));
@@ -739,7 +741,17 @@ public class ZUGFeRDInvoiceImporter {
} }
} }
} }
if (typeC == 50) {
if (additionalReferencedDocument != null){
if (additionalReferencedDocumentDate!=null) {
zpp.setTenderReferencedDocument(new DatedReference(additionalReferencedDocument, additionalReferencedDocumentDate));
} else {
zpp.setTenderReferencedDocument(additionalReferencedDocument);
}
}
} }
} }
} }
@@ -984,13 +996,6 @@ public class ZUGFeRDInvoiceImporter {
} }
} }
if (additionalReferencedDocument != null){
if (additionalReferencedDocumentDate!=null) {
zpp.setTenderReferencedDocument(new DatedReference(additionalReferencedDocument, additionalReferencedDocumentDate));
} else {
zpp.setTenderReferencedDocument(additionalReferencedDocument);
}
}
String invoiceReferencedDocumentID = extractString("//*[local-name()=\"InvoiceReferencedDocument\"]/*[local-name()=\"IssuerAssignedID\"]|//*[local-name()=\"BillingReference\"]/*[local-name()=\"InvoiceDocumentReference\"]/*[local-name()=\"ID\"]"); String invoiceReferencedDocumentID = extractString("//*[local-name()=\"InvoiceReferencedDocument\"]/*[local-name()=\"IssuerAssignedID\"]|//*[local-name()=\"BillingReference\"]/*[local-name()=\"InvoiceDocumentReference\"]/*[local-name()=\"ID\"]");
if (!invoiceReferencedDocumentID.isEmpty()) { if (!invoiceReferencedDocumentID.isEmpty()) {
zpp.setInvoiceReferencedDocumentID(invoiceReferencedDocumentID); zpp.setInvoiceReferencedDocumentID(invoiceReferencedDocumentID);