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

recorrected import to also still work with fx

Browse Source
This commit is contained in:
jstaerk
2022-01-02 17:49:13 +01:00
parent b5983a17f3
commit c62171e64d
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
View File

@@ -572,7 +572,10 @@ public class ZUGFeRDImporter {
public String getAmount() { public String getAmount() {
String result = extractString("//*[local-name() = 'SpecifiedTradeSettlementHeaderMonetarySummation']/*[local-name() = 'DuePayableAmount']"); String result = extractString("//*[local-name() = 'SpecifiedTradeSettlementHeaderMonetarySummation']/*[local-name() = 'DuePayableAmount']");
if (result == null || result.isEmpty()) { if (result == null || result.isEmpty()) {
result = extractString("//*[local-name() = 'SpecifiedTradeSettlementHeaderMonetarySummation']/*[local-name() = 'GrandTotalAmount']");
/* fx/zf would be SpecifiedTradeSettlementMonetarySummation
* but ox is SpecifiedTradeSettlementHeaderMonetarySummation...*/
result = extractString("//*[local-name() = 'GrandTotalAmount']");
} }
return result; return result;
} }

12
validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java
View File

@@ -57,7 +57,19 @@ public class ZUGFeRDValidatorTest extends ResourceCase {
res = zfv.validate(tempFile.getAbsolutePath()); res = zfv.validate(tempFile.getAbsolutePath());
assertThat(res).valueByXPath("/validation/summary/@status") assertThat(res).valueByXPath("/validation/summary/@status")
.isEqualTo("valid"); .isEqualTo("valid");
/*
tempFile = getResourceAsFile("testout-OX.pdf");
zfv = new ZUGFeRDValidator();
res = zfv.validate(tempFile.getAbsolutePath());
assertThat(res).valueByXPath("/validation/summary/@status")
.isEqualTo("valid");
tempFile = getResourceAsFile("testout-OX.xml");
zfv = new ZUGFeRDValidator();
res = zfv.validate(tempFile.getAbsolutePath());
assertThat(res).valueByXPath("/validation/summary/@status")
.isEqualTo("valid");
*/
tempFile = getResourceAsFile("invalidXRechnung.pdf"); tempFile = getResourceAsFile("invalidXRechnung.pdf");
zfv = new ZUGFeRDValidator(); zfv = new ZUGFeRDValidator();
res = zfv.validate(tempFile.getAbsolutePath()); res = zfv.validate(tempFile.getAbsolutePath());