diff --git a/History.md b/History.md
index 15e07540..c6e1a252 100644
--- a/History.md
+++ b/History.md
@@ -1,18 +1,21 @@
+2.7.3
+=======
+- \#328 parse SpecifiedTradeProduct/SellerAssignedID, SellerOrderReferencedDocument/ram:IssuerAssignedID and BuyerOrderReferencedDocument/ram:IssuerAssignedID in invoiceparser
2.7.2
=======
2023-06-09
-- #322 support basis quantity in item class, invoice importer
-- #327 expose validation results and location item (thanks to jpep-in)
+- \#322 support basis quantity in item class, invoice importer
+- \#327 expose validation results and location item (thanks to jpep-in)
2.7.1
=======
2023-05-25
-- #317 (support conversion towards peppol #282)
-- #313 Update CII2UBL library
+- \#317 (support conversion towards peppol #282)
+- \#313 Update CII2UBL library
- https://github.com/ZUGFeRD/mustangproject/pull/315 invoiceimporter constructor for InputStream
- be able to extract data into existing invoice objects
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
index 6ebf16d9..84fa5d7d 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
@@ -146,6 +146,47 @@ public class ZUGFeRDInvoiceImporter extends ZUGFeRDImporter {
}
}
+ xpr = xpath.compile("//*[local-name()=\"ApplicableHeaderTradeAgreement\"]");
+ NodeList headerTradeAgreementNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
+ String buyerOrderIssuerAssignedID = null;
+ String sellerOrderIssuerAssignedID = null;
+ for (int i = 0; i < headerTradeAgreementNodes.getLength(); i++) {
+ // nodes.item(i).getTextContent())) {
+ Node headerTradeAgreementNode = headerTradeAgreementNodes.item(i);
+ NodeList headerTradeAgreementChilds = headerTradeAgreementNode.getChildNodes();
+ for (int agreementChildIndex = 0; agreementChildIndex < headerTradeAgreementChilds
+ .getLength(); agreementChildIndex++) {
+ if ((headerTradeAgreementChilds.item(agreementChildIndex).getLocalName() != null)
+ && (headerTradeAgreementChilds.item(agreementChildIndex).getLocalName()
+ .equals("BuyerOrderReferencedDocument"))) {
+ NodeList buyerOrderChilds = headerTradeAgreementChilds.item(agreementChildIndex).getChildNodes();
+ for (int buyerOrderChildIndex = 0; buyerOrderChildIndex < buyerOrderChilds
+ .getLength(); buyerOrderChildIndex++) {
+ if ((buyerOrderChilds.item(buyerOrderChildIndex).getLocalName() != null)
+ && (buyerOrderChilds.item(buyerOrderChildIndex).getLocalName()
+ .equals("IssuerAssignedID"))) {
+ buyerOrderIssuerAssignedID = buyerOrderChilds.item(buyerOrderChildIndex).getTextContent();
+ }
+ }
+ }
+ if ((headerTradeAgreementChilds.item(agreementChildIndex).getLocalName() != null)
+ && (headerTradeAgreementChilds.item(agreementChildIndex).getLocalName()
+ .equals("SellerOrderReferencedDocument"))) {
+ NodeList sellerOrderChilds = headerTradeAgreementChilds.item(agreementChildIndex).getChildNodes();
+ for (int sellerOrderChildIndex = 0; sellerOrderChildIndex < sellerOrderChilds
+ .getLength(); sellerOrderChildIndex++) {
+ if ((sellerOrderChilds.item(sellerOrderChildIndex).getLocalName() != null)
+ && (sellerOrderChilds.item(sellerOrderChildIndex).getLocalName()
+ .equals("IssuerAssignedID"))) {
+ sellerOrderIssuerAssignedID = sellerOrderChilds.item(sellerOrderChildIndex).getTextContent();
+ }
+ }
+ }
+ }
+
+ }
+
+
xpr = xpath.compile("//*[local-name()=\"ApplicableHeaderTradeSettlement\"]|//*[local-name()=\"ApplicableSupplyChainTradeSettlement\"]");
NodeList headerTradeSettlementNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
@@ -180,6 +221,13 @@ public class ZUGFeRDInvoiceImporter extends ZUGFeRDImporter {
zpp.setDueDate(dueDate).setDeliveryDate(deliveryDate).setIssueDate(issueDate)
.setSender(new TradeParty(SellerNodes)).setRecipient(new TradeParty(BuyerNodes)).setNumber(number);
+ if (buyerOrderIssuerAssignedID != null) {
+ zpp.setBuyerOrderReferencedDocumentID(buyerOrderIssuerAssignedID);
+ }
+ if (sellerOrderIssuerAssignedID != null) {
+ zpp.setSellerOrderReferencedDocumentID(sellerOrderIssuerAssignedID);
+ }
+
//.addItem(new Item(new Product("Testprodukt","","C62",BigDecimal.ZERO),amount,new BigDecimal(1.0)))
zpp.setOwnOrganisationName(extractString("//*[local-name()=\"SellerTradeParty\"]/*[local-name()=\"Name\"]"));
@@ -203,6 +251,7 @@ public class ZUGFeRDInvoiceImporter extends ZUGFeRDImporter {
String price = "0";
String basisQuantity = "1";
String name = "";
+ String sellerAssignedID = null;
String description = "";
SchemedID gid = null;
String quantity = "0";
@@ -295,6 +344,11 @@ public class ZUGFeRDInvoiceImporter extends ZUGFeRDImporter {
.equals("Name"))) {
name = tradeProductChilds.item(tradeProductChildIndex).getTextContent();
}
+ if ((tradeProductChilds.item(tradeProductChildIndex).getLocalName() != null)
+ && (tradeProductChilds.item(tradeProductChildIndex).getLocalName()
+ .equals("SellerAssignedID"))) {
+ sellerAssignedID = tradeProductChilds.item(tradeProductChildIndex).getTextContent();
+ }
if ((tradeProductChilds.item(tradeProductChildIndex).getLocalName() != null)
&& (tradeProductChilds.item(tradeProductChildIndex).getLocalName()
.equals("GlobalID"))) {
@@ -356,6 +410,9 @@ public class ZUGFeRDInvoiceImporter extends ZUGFeRDImporter {
if (gid != null) {
p.addGlobalID(gid);
}
+ if (sellerAssignedID != null) {
+ p.setSellerAssignedID(sellerAssignedID);
+ }
Item it = new Item(p, prc, qty);
it.setBasisQuantity(new BigDecimal(basisQuantity));
if (rdocs != null) {
@@ -457,11 +514,11 @@ public class ZUGFeRDInvoiceImporter extends ZUGFeRDImporter {
/***
* This will parse a XML into a invoice object
- *
+ *
* @return the parsed invoice object
*/
public Invoice extractInvoice() throws XPathExpressionException, ParseException {
- Invoice i=new Invoice();
+ Invoice i = new Invoice();
return extractInto(i);
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
index d1292d06..34f17863 100644
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
@@ -384,12 +384,13 @@ public class ZF2PushTest extends TestCase {
SchemedID gtin=new SchemedID("0160","2001015001325");
SchemedID gln=new SchemedID("0088","4304171000002");
ze.setTransaction(new Invoice().setCurrency("CHF").addNote("document level 1/2").addNote("document level 2/2").setDueDate(new Date()).setIssueDate(new Date()).setDeliveryDate(new Date())
+ .setSellerOrderReferencedDocumentID("9384").setBuyerOrderReferencedDocumentID("28934")
.setDetailedDeliveryPeriod(new SimpleDateFormat("yyyyMMdd").parse(occurrenceFrom), new SimpleDateFormat("yyyyMMdd").parse(occurrenceTo))
.setSender(new TradeParty(orgname, "teststr", "55232", "teststadt", "DE").addTaxID(taxID).setID("0009845"))
.setDeliveryAddress(new TradeParty("just the other side of the street", "teststr.12a", "55232", "Entenhausen", "DE").addVATID("DE47110"))
.setContractReferencedDocument(contractID)
.setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE").addGlobalID(gln).addVATID("DE4711").setContact(new Contact("Franz Müller", "01779999999", "franz@mueller.de", "teststr. 12", "55232", "Entenhausen", "DE").setFax("++49555123456")).setAdditionalAddress("Hinterhaus 3"))
- .addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(16)).addGlobalID(gtin), price, new BigDecimal(1.0)).addReferencedLineID("xxx").addNote("item level 1/1").addAllowance(new Allowance(new BigDecimal(0.02)).setReason("item discount").setTaxPercent(new BigDecimal(16))).setDetailedDeliveryPeriod(sdf.parse("2020-01-13"), sdf.parse("2020-01-15")))
+ .addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(16)).addGlobalID(gtin).setSellerAssignedID("4711"), price, new BigDecimal(1.0)).addReferencedLineID("xxx").addNote("item level 1/1").addAllowance(new Allowance(new BigDecimal(0.02)).setReason("item discount").setTaxPercent(new BigDecimal(16))).setDetailedDeliveryPeriod(sdf.parse("2020-01-13"), sdf.parse("2020-01-15")))
.addCharge(new Charge(new BigDecimal(0.5)).setReason("quick delivery charge").setTaxPercent(new BigDecimal(16)))
.addAllowance(new Allowance(new BigDecimal(0.2)).setReason("discount").setTaxPercent(new BigDecimal(16)))
.setDeliveryDate(sdf.parse("2020-11-02")).setOwnVATID("DE0815").setNumber(number).setVATDueDateTypeCode(EventTimeCodeTypeConstants.PAYMENT_DATE)
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
index 1103adae..23855d19 100644
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
@@ -1,22 +1,24 @@
-/** **********************************************************************
- *
+/**
+ * *********************************************************************
+ *
* Copyright 2019 Jochen Staerk
- *
+ *
* Use is subject to license terms.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0.
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
+ *
* See the License for the specific language governing permissions and
* limitations under the License.
- *
- *********************************************************************** */
+ *
+ * **********************************************************************
+ */
package org.mustangproject.ZUGFeRD;
import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
@@ -46,18 +48,19 @@ import java.text.SimpleDateFormat;
* Classname ZF2ZInvoiceImporterTest is alphabetical behind the tests which will create the file
* used for this import, testout-ZF2New.pdf
*/
-public class ZF2ZInvoiceImporterTest extends ResourceCase {
+public class ZF2ZInvoiceImporterTest extends ResourceCase {
+
public void testInvoiceImport() {
- ZUGFeRDInvoiceImporter zii=new ZUGFeRDInvoiceImporter("./target/testout-ZF2new.pdf");
+ ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2new.pdf");
- boolean hasExceptions=false;
- Invoice invoice=null;
+ boolean hasExceptions = false;
+ Invoice invoice = null;
try {
- invoice=zii.extractInvoice();
+ invoice = zii.extractInvoice();
} catch (XPathExpressionException | ParseException e) {
- hasExceptions=true;
+ hasExceptions = true;
}
assertFalse(hasExceptions);
// Reading ZUGFeRD
@@ -72,10 +75,10 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
assertEquals("7.00", invoice.getZFItems()[0].getProduct().getVATPercent().toString());
assertEquals("RE-20170509/505", invoice.getNumber());
- SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
- assertEquals("2017-05-09",sdf.format(invoice.getIssueDate()));
- assertEquals("2017-05-07",sdf.format(invoice.getDeliveryDate()));
- assertEquals("2017-05-30",sdf.format(invoice.getDueDate()));
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ assertEquals("2017-05-09", sdf.format(invoice.getIssueDate()));
+ assertEquals("2017-05-07", sdf.format(invoice.getDeliveryDate()));
+ assertEquals("2017-05-30", sdf.format(invoice.getDueDate()));
assertEquals("Bahnstr. 42", invoice.getRecipient().getStreet());
assertEquals("Hinterhaus", invoice.getRecipient().getAdditionalAddress());
@@ -89,25 +92,43 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
assertEquals("DE", invoice.getSender().getCountry());
assertEquals("Stadthausen", invoice.getSender().getLocation());
- TransactionCalculator tc=new TransactionCalculator(invoice);
- assertEquals(new BigDecimal("571.04"),tc.getGrandTotal());
+ TransactionCalculator tc = new TransactionCalculator(invoice);
+ assertEquals(new BigDecimal("571.04"), tc.getGrandTotal());
// name street location zip country, contact name phone email, total amount
+ }
+ public void testEdgeInvoiceImport() {
+
+ ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2PushEdge.pdf");
+
+ boolean hasExceptions = false;
+ Invoice invoice = null;
+ try {
+ invoice = zii.extractInvoice();
+ } catch (XPathExpressionException | ParseException e) {
+ hasExceptions = true;
+ }
+ assertFalse(hasExceptions);
+ // Reading ZUGFeRD
+ assertEquals("4711", invoice.getZFItems()[0].getProduct().getSellerAssignedID());
+ assertEquals("9384", invoice.getSellerOrderReferencedDocumentID());
+ assertEquals("28934", invoice.getBuyerOrderReferencedDocumentID());
}
+
public void testZF1Import() {
- ZUGFeRDInvoiceImporter zii=new ZUGFeRDInvoiceImporter("./target/testout-MustangGnuaccountingBeispielRE-20171118_506zf1.pdf");
+ ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-MustangGnuaccountingBeispielRE-20171118_506zf1.pdf");
- boolean hasExceptions=false;
- Invoice invoice=null;
+ boolean hasExceptions = false;
+ Invoice invoice = null;
try {
- invoice=zii.extractInvoice();
+ invoice = zii.extractInvoice();
} catch (XPathExpressionException | ParseException e) {
- hasExceptions=true;
+ hasExceptions = true;
}
assertFalse(hasExceptions);
// Reading ZUGFeRD
@@ -121,9 +142,9 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
assertEquals("7.00", invoice.getZFItems()[0].getProduct().getVATPercent().toString());
assertEquals("RE-20190610/507", invoice.getNumber());
- SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
- assertEquals("2019-06-10",sdf.format(invoice.getIssueDate()));
- assertEquals("2019-07-01",sdf.format(invoice.getDueDate()));
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ assertEquals("2019-06-10", sdf.format(invoice.getIssueDate()));
+ assertEquals("2019-07-01", sdf.format(invoice.getDueDate()));
assertEquals("street", invoice.getRecipient().getStreet());
assertEquals("zip", invoice.getRecipient().getZIP());
@@ -135,85 +156,84 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
assertEquals("DE", invoice.getSender().getCountry());
assertEquals("city", invoice.getSender().getLocation());
- TransactionCalculator tc=new TransactionCalculator(invoice);
- assertEquals(new BigDecimal("571.04"),tc.getGrandTotal());
+ TransactionCalculator tc = new TransactionCalculator(invoice);
+ assertEquals(new BigDecimal("571.04"), tc.getGrandTotal());
// name street location zip country, contact name phone email, total amount
-
}
public void testItemAllowancesChargesImport() {
- ZUGFeRDInvoiceImporter zii=new ZUGFeRDInvoiceImporter("./target/testout-ZF2PushItemChargesAllowances.pdf");
+ ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2PushItemChargesAllowances.pdf");
- boolean hasExceptions=false;
- Invoice invoice=null;
+ boolean hasExceptions = false;
+ Invoice invoice = null;
try {
- invoice=zii.extractInvoice();
+ invoice = zii.extractInvoice();
} catch (XPathExpressionException | ParseException e) {
- hasExceptions=true;
+ hasExceptions = true;
}
assertFalse(hasExceptions);
- TransactionCalculator tc=new TransactionCalculator(invoice);
- assertEquals(new BigDecimal("18.33"),tc.getGrandTotal());
+ TransactionCalculator tc = new TransactionCalculator(invoice);
+ assertEquals(new BigDecimal("18.33"), tc.getGrandTotal());
}
public void testBasisQuantityImport() {
- ZUGFeRDInvoiceImporter zii=new ZUGFeRDInvoiceImporter("./target/testout-ZF2newEdge.pdf");
+ ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2newEdge.pdf");
- boolean hasExceptions=false;
- Invoice invoice=null;
+ boolean hasExceptions = false;
+ Invoice invoice = null;
try {
- invoice=zii.extractInvoice();
+ invoice = zii.extractInvoice();
} catch (XPathExpressionException | ParseException e) {
- hasExceptions=true;
+ hasExceptions = true;
}
assertFalse(hasExceptions);
- TransactionCalculator tc=new TransactionCalculator(invoice);
- assertEquals(new BigDecimal("337.60"),tc.getGrandTotal());
+ TransactionCalculator tc = new TransactionCalculator(invoice);
+ assertEquals(new BigDecimal("337.60"), tc.getGrandTotal());
}
public void testAllowancesChargesImport() {
- ZUGFeRDInvoiceImporter zii=new ZUGFeRDInvoiceImporter("./target/testout-ZF2PushChargesAllowances.pdf");
+ ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2PushChargesAllowances.pdf");
- boolean hasExceptions=false;
- Invoice invoice=null;
+ boolean hasExceptions = false;
+ Invoice invoice = null;
try {
- invoice=zii.extractInvoice();
+ invoice = zii.extractInvoice();
} catch (XPathExpressionException | ParseException e) {
- hasExceptions=true;
+ hasExceptions = true;
}
assertFalse(hasExceptions);
- TransactionCalculator tc=new TransactionCalculator(invoice);
- assertEquals(new BigDecimal("11.07"),tc.getGrandTotal());
+ TransactionCalculator tc = new TransactionCalculator(invoice);
+ assertEquals(new BigDecimal("11.07"), tc.getGrandTotal());
}
public void testXRImport() {
- boolean hasExceptions=false;
+ boolean hasExceptions = false;
- ZUGFeRDInvoiceImporter zii=new ZUGFeRDInvoiceImporter();
+ ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter();
try {
zii.fromXML(new String(Files.readAllBytes(Paths.get("./target/testout-XR-Edge.xml")), StandardCharsets.UTF_8));
} catch (IOException e) {
- hasExceptions=true;
+ hasExceptions = true;
}
- Invoice invoice=null;
+ Invoice invoice = null;
try {
- invoice=zii.extractInvoice();
+ invoice = zii.extractInvoice();
} catch (XPathExpressionException | ParseException e) {
- hasExceptions=true;
+ hasExceptions = true;
}
assertFalse(hasExceptions);
- TransactionCalculator tc=new TransactionCalculator(invoice);
- assertEquals(new BigDecimal("1.00"),tc.getGrandTotal());
+ TransactionCalculator tc = new TransactionCalculator(invoice);
+ assertEquals(new BigDecimal("1.00"), tc.getGrandTotal());
}