From 566ead3c67901ac6a0f28e90236c0c856cd37287 Mon Sep 17 00:00:00 2001 From: Alexander Berndt Date: Fri, 22 May 2020 15:25:18 +0200 Subject: [PATCH] Updated ZUGFeRDImporter.java -> getReference() to fit ZUGFeRD 1.0 Added Test --- .../org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java | 11 ++++++++++- .../test/java/org/mustangproject/ZUGFeRD/ZF2Test.java | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java index e9060de1..5bfa88af 100644 --- a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java +++ b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java @@ -276,7 +276,16 @@ public class ZUGFeRDImporter { * @return the referred document */ 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 ""; + } } diff --git a/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java b/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java index 6dd1eff1..12700b07 100644 --- a/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java +++ b/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java @@ -208,6 +208,7 @@ public class ZF2Test extends MustangReaderTestCase { assertEquals(zi.getAmount(), "571.04"); assertEquals(zi.getHolder(), getOwnOrganisationName()); assertEquals(zi.getDocumentCode(),"380"); + assertEquals(zi.getReference(),"AB321"); assertEquals(zi.getAmount(), "571.04"); assertEquals(zi.getBIC(), getTradeSettlementPayment()[0].getOwnBIC()); assertEquals(zi.getIBAN(),getTradeSettlementPayment()[0].getOwnIBAN());