From a555f93bc285781899546da555c7315fcfdb1588 Mon Sep 17 00:00:00 2001 From: jstaerk Date: Thu, 9 Jan 2025 07:17:26 +0100 Subject: [PATCH 1/2] corrected master, getReferenceNumber UBL --- .../org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java | 11 +---------- .../java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java | 10 ---------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java index 6ff0a4b8..76abd748 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java @@ -310,16 +310,7 @@ public class ZUGFeRDImporter extends ZUGFeRDInvoiceImporter { * @return the referred document */ public String getReference() { - try { - if (getVersion() == 1) { - return extractString("//*[local-name() = 'ApplicableSupplyChainTradeAgreement']/*[local-name() = 'BuyerReference']"); - } else { - return extractString("//*[local-name() = 'ApplicableHeaderTradeAgreement']/*[local-name() = 'BuyerReference']"); - } - } catch (final Exception e) { - // Exception was already logged - return ""; - } + return importedInvoice.getReferenceNumber(); } diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java index baac90df..4708b09a 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java @@ -274,16 +274,6 @@ public class ZF2EdgeTest extends MustangReaderTestCase { return "123"; } - @Override - public String getPaymentMeansCode() { - return "42"; - } - - @Override - public String getPaymentMeansInformation() { - return "Überweisung"; - } - /** * Create the test case * From 1605d1e2f6d56660b491e3e8191a87e6f5970ded Mon Sep 17 00:00:00 2001 From: jstaerk Date: Thu, 9 Jan 2025 07:19:14 +0100 Subject: [PATCH 2/2] added criteria for test --- .../src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java index b8012b57..03c495c8 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java @@ -277,6 +277,7 @@ public class ZF2PushTest extends TestCase { assertEquals("EUR", zi.getInvoiceCurrencyCode()); assertTrue(zi.getUTF8().contains("0911623562")); // fax number + assertTrue(zi.getUTF8().contains("ABK")); // Reading ZUGFeRD assertEquals("18.33", zi.getAmount());