diff --git a/History.md b/History.md index 0ea8685d..57fc4562 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,4 @@ -2.16.0 +2.15.1 ======= - #566 - have a bean contructor for direct debit diff --git a/library/src/main/java/org/mustangproject/CalculatedInvoice.java b/library/src/main/java/org/mustangproject/CalculatedInvoice.java index 729d0f9b..c6a24fb1 100644 --- a/library/src/main/java/org/mustangproject/CalculatedInvoice.java +++ b/library/src/main/java/org/mustangproject/CalculatedInvoice.java @@ -11,11 +11,13 @@ import java.math.BigDecimal; public class CalculatedInvoice extends Invoice implements Serializable { - protected BigDecimal grandTotal=null; + protected BigDecimal grandTotal=null; + protected BigDecimal lineTotalAmount=null; public void calculate() { TransactionCalculator tc=new TransactionCalculator(this); grandTotal=tc.getGrandTotal(); + lineTotalAmount=tc.getValue(); } public BigDecimal getGrandTotal() { if (grandTotal==null) { @@ -27,4 +29,15 @@ public class CalculatedInvoice extends Invoice implements Serializable { grandTotal=grand; return this; } + public BigDecimal getLineTotalAmount() { + if (lineTotalAmount==null) { + calculate(); + } + return lineTotalAmount; + } + public CalculatedInvoice setLineTotalAmount(BigDecimal total) { + lineTotalAmount=total; + return this; + } + } diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java index 7c1001e5..a137a67f 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java @@ -330,6 +330,15 @@ public class ZUGFeRDInvoiceImporter { zpp.setTotalPrepaidAmount(new BigDecimal(XMLTools.trimOrNull(prepaidNodes.item(0)))); } + + xpr = xpath.compile("//*[local-name()=\"SpecifiedTradeSettlementHeaderMonetarySummation\"]/*[local-name()=\"LineTotalAmount\"]|//*[local-name()=\"LegalMonetaryTotal\"]/*[local-name()=\"LineExtensionAmount\"]"); + NodeList lineTotalNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET); + if (lineTotalNodes.getLength() > 0) { + if (zpp instanceof CalculatedInvoice) { + ((CalculatedInvoice) zpp).setLineTotalAmount(new BigDecimal(XMLTools.trimOrNull(lineTotalNodes.item(0)))); + } + } + Date issueDate = null; Date dueDate = null; Date deliveryDate = null; @@ -628,9 +637,9 @@ public class ZUGFeRDInvoiceImporter { xpr = xpath.compile("//*[local-name()=\"BuyerReference\"]"); String buyerReference = null; - prepaidNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET); - if (prepaidNodes.getLength() > 0) { - buyerReference = XMLTools.trimOrNull(prepaidNodes.item(0)); + lineTotalNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET); + if (lineTotalNodes.getLength() > 0) { + buyerReference = XMLTools.trimOrNull(lineTotalNodes.item(0)); } if (buyerReference != null) { zpp.setReferenceNumber(buyerReference); diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java index e07e2794..e274b201 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java @@ -384,13 +384,19 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase { ZUGFeRDInvoiceImporter importer = new ZUGFeRDInvoiceImporter(); importer.doIgnoreCalculationErrors(); importer.setInputStream(inputStream); - Invoice invoice = importer.extractInvoice(); + + CalculatedInvoice invoice = new CalculatedInvoice(); + importer.extractInto(invoice); + boolean isBD=invoice.getTotalPrepaidAmount() instanceof BigDecimal; assertTrue(isBD); - BigDecimal expected=new BigDecimal(50); + BigDecimal expectedPrepaid=new BigDecimal(50); + BigDecimal expectedLineTotal=new BigDecimal("180.76"); if (isBD) { BigDecimal amread=invoice.getTotalPrepaidAmount(); - assertTrue(amread.compareTo(expected) == 0); + BigDecimal amline=invoice.getLineTotalAmount(); + assertTrue(amread.compareTo(expectedPrepaid) == 0); + assertTrue(amline.compareTo(expectedLineTotal) == 0); } }