From 2a2c3747b10b86c5360e14b08ec286427abbd42e Mon Sep 17 00:00:00 2001 From: Alexander Berndt Date: Thu, 18 Jun 2020 11:08:09 +0200 Subject: [PATCH] Added getTaxPointDate() to ZUGFeRDImporter.java Added Test --- .../mustangproject/ZUGFeRD/ZUGFeRDImporter.java | 16 ++++++++++++++++ .../java/org/mustangproject/ZUGFeRD/ZF2Test.java | 1 + 2 files changed, 17 insertions(+) diff --git a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java index 324792ea..263bcdab 100644 --- a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java +++ b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java @@ -329,6 +329,22 @@ public class ZUGFeRDImporter { } } + /** + * @return the Taxpoint Date + */ + public String getTaxPointDate() { + try { + if (getVersion() == 1) { + return extractString("//ActualDeliverySupplyChainEvent//OccurrenceDateTime//DateTimeString"); + } else { + return extractString("//ActualDeliverySupplyChainEvent//OccurrenceDateTime//DateTimeString"); + } + } catch (Exception e) { + e.printStackTrace(); + return ""; + } + } + /** * @return the Invoice ID */ diff --git a/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java b/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java index e22ccc7a..adee33fc 100644 --- a/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java +++ b/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java @@ -212,6 +212,7 @@ public class ZF2Test extends MustangReaderTestCase { assertEquals(zi.getInvoiceCurrencyCode(), "EUR"); assertEquals(zi.getIssuerAssignedID(),""); assertEquals(zi.getIssueDate(), "20170509"); + assertEquals(zi.getTaxPointDate(), "20170507"); assertEquals(zi.getBuyerTradePartyID(), "DE999999999"); assertEquals(zi.getHolder(), getOwnOrganisationName()); assertEquals(zi.getDocumentCode(),"380");