From 4799f9586818dc783b106e7cd59846afaafe3444 Mon Sep 17 00:00:00 2001 From: jstaerk Date: Mon, 2 Dec 2024 10:42:05 +0100 Subject: [PATCH] import docuemtne level included notes in ubl --- .../ZUGFeRD/ZUGFeRDInvoiceImporter.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java index 12504210..5eabd0a4 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java @@ -306,8 +306,18 @@ public class ZUGFeRDInvoiceImporter { zpp.setDeliveryAddress(new TradeParty(deliveryNodes)); } + List includedNotes = new ArrayList<>(); //UBL... + XPathExpression UBLNotesEx = xpath.compile("/*[local-name()=\"Invoice\"]/*[local-name()=\"Note\"]"); + NodeList UBLNotesNd = (NodeList) UBLNotesEx.evaluate(getDocument(), XPathConstants.NODESET); + if ((UBLNotesNd != null) && (UBLNotesNd.getLength() > 0)) { + for (int nodeIndex = 0; nodeIndex < UBLNotesNd.getLength(); nodeIndex++) { + includedNotes.add(IncludedNote.generalNote(UBLNotesNd.item(nodeIndex).getTextContent())); + } + zpp.addNotes(includedNotes); + } + XPathExpression shipExUBL = xpath.compile("//*[local-name()=\"Delivery\"]"); Node deliveryNode = (Node) shipExUBL.evaluate(getDocument(), XPathConstants.NODE); @@ -473,6 +483,7 @@ public class ZUGFeRDInvoiceImporter { Date dueDate = null; Date deliveryDate = null; String despatchAdviceReferencedDocument = null; + for (int i = 0; i < ExchangedDocumentNodes.getLength(); i++) { Node exchangedDocumentNode = ExchangedDocumentNodes.item(i); NodeList exchangedDocumentChilds = exchangedDocumentNode.getChildNodes(); @@ -493,7 +504,6 @@ public class ZUGFeRDInvoiceImporter { } } } - List includedNotes = new ArrayList<>(); if ((item.getLocalName() != null) && (item.getLocalName().equals("IncludedNote"))) { String subjectCode = ""; String content = null;