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

Updated ZUGFeRDImporter.java -> getReference() to fit ZUGFeRD 1.0

Browse Source 
Added Test
This commit is contained in:
Alexander Berndt
2020-05-22 15:25:18 +02:00
parent 0cde732e43
commit 566ead3c67
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
View File

@@ -276,7 +276,16 @@ public class ZUGFeRDImporter {
* @return the referred document * @return the referred document
*/ */
public String getReference() { public String getReference() {
return extractString("//ApplicableHeaderTradeAgreement/BuyerReference"); try {
if (getVersion() == 1) {
return extractString("//ApplicableSupplyChainTradeAgreement/BuyerReference");
} else {
return extractString("//ApplicableHeaderTradeAgreement/BuyerReference");
}
} catch (Exception e) {
e.printStackTrace();
return "";
}
} }

1
libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java
View File

@@ -208,6 +208,7 @@ public class ZF2Test extends MustangReaderTestCase {
assertEquals(zi.getAmount(), "571.04"); assertEquals(zi.getAmount(), "571.04");
assertEquals(zi.getHolder(), getOwnOrganisationName()); assertEquals(zi.getHolder(), getOwnOrganisationName());
assertEquals(zi.getDocumentCode(),"380"); assertEquals(zi.getDocumentCode(),"380");
assertEquals(zi.getReference(),"AB321");
assertEquals(zi.getAmount(), "571.04"); assertEquals(zi.getAmount(), "571.04");
assertEquals(zi.getBIC(), getTradeSettlementPayment()[0].getOwnBIC()); assertEquals(zi.getBIC(), getTradeSettlementPayment()[0].getOwnBIC());
assertEquals(zi.getIBAN(),getTradeSettlementPayment()[0].getOwnIBAN()); assertEquals(zi.getIBAN(),getTradeSettlementPayment()[0].getOwnIBAN());