closes #579
This commit is contained in:
@@ -5,6 +5,7 @@
|
|||||||
-? lineTotalAmount is null
|
-? lineTotalAmount is null
|
||||||
? be able to access ID in error message
|
? be able to access ID in error message
|
||||||
? log error IDs
|
? log error IDs
|
||||||
|
- closes #579
|
||||||
|
|
||||||
|
|
||||||
2.15.0
|
2.15.0
|
||||||
|
|||||||
@@ -324,7 +324,7 @@ public class ZUGFeRDInvoiceImporter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
xpr = xpath.compile("//*[local-name()=\"PrepaidAmount\"]");
|
xpr = xpath.compile("//*[local-name()=\"TotalPrepaidAmount\"]|//*[local-name()=\"PrepaidAmount\"]");
|
||||||
NodeList prepaidNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
|
NodeList prepaidNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
|
||||||
if (prepaidNodes.getLength() > 0) {
|
if (prepaidNodes.getLength() > 0) {
|
||||||
zpp.setTotalPrepaidAmount(new BigDecimal(XMLTools.trimOrNull(prepaidNodes.item(0))));
|
zpp.setTotalPrepaidAmount(new BigDecimal(XMLTools.trimOrNull(prepaidNodes.item(0))));
|
||||||
|
|||||||
@@ -377,6 +377,25 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testImportPrepaid() throws XPathExpressionException, ParseException {
|
||||||
|
InputStream inputStream = this.getClass()
|
||||||
|
.getResourceAsStream("/EN16931_1_Teilrechnung.pdf");
|
||||||
|
ZUGFeRDInvoiceImporter importer = new ZUGFeRDInvoiceImporter();
|
||||||
|
importer.doIgnoreCalculationErrors();
|
||||||
|
importer.setInputStream(inputStream);
|
||||||
|
Invoice invoice = importer.extractInvoice();
|
||||||
|
boolean isBD=invoice.getTotalPrepaidAmount() instanceof BigDecimal;
|
||||||
|
assertTrue(isBD);
|
||||||
|
BigDecimal expected=new BigDecimal(50);
|
||||||
|
if (isBD) {
|
||||||
|
BigDecimal amread=invoice.getTotalPrepaidAmount();
|
||||||
|
assertTrue(amread.compareTo(expected) == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testImportIncludedNotes() throws XPathExpressionException, ParseException {
|
public void testImportIncludedNotes() throws XPathExpressionException, ParseException {
|
||||||
InputStream inputStream = this.getClass()
|
InputStream inputStream = this.getClass()
|
||||||
|
|||||||
BIN
library/src/test/resources/EN16931_1_Teilrechnung.pdf
Normal file
BIN
library/src/test/resources/EN16931_1_Teilrechnung.pdf
Normal file
Binary file not shown.
Reference in New Issue
Block a user