From 738c4516b007f8305dad106f25140ce3c5bb2666 Mon Sep 17 00:00:00 2001 From: jstaerk Date: Fri, 17 Jan 2025 14:40:54 +0100 Subject: [PATCH] setter correction --- History.md | 2 ++ library/src/main/java/org/mustangproject/Invoice.java | 9 +++++++++ .../mustangproject/ZUGFeRD/DeSerializationTest.java | 10 ++++++++++ 3 files changed, 21 insertions(+) diff --git a/History.md b/History.md index 4a4c67a6..acf2b5ad 100644 --- a/History.md +++ b/History.md @@ -1,6 +1,8 @@ - #678 - #679 - #681 +- be able to set detailedDeliveryPeriodFrom, detailedDeliveryPeriodTo MS188 +- updated verapdf from 1.26.1 to 1.26.2 2.16.0 ======= diff --git a/library/src/main/java/org/mustangproject/Invoice.java b/library/src/main/java/org/mustangproject/Invoice.java index 04c8b5dc..639663b9 100644 --- a/library/src/main/java/org/mustangproject/Invoice.java +++ b/library/src/main/java/org/mustangproject/Invoice.java @@ -783,11 +783,20 @@ public class Invoice implements IExportableTransaction { return detailedDeliveryDateStart; } + public Invoice setDetailedDeliveryPeriodFrom(Date dt) { + detailedDeliveryDateStart=dt; + return this; + } + @Override public Date getDetailedDeliveryPeriodTo() { return detailedDeliveryPeriodEnd; } + public Invoice setDetailedDeliveryPeriodTo(Date dt) { + detailedDeliveryPeriodEnd=dt; + return this; + } /** * adds a free text paragraph, which will become an includedNote element diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java index 746e7cbb..24f4044a 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java @@ -102,6 +102,8 @@ public class DeSerializationTest extends ResourceCase { " \"currency\": \"EUR\",\n" + " \"issueDate\": \"2018-03-03T23:00:00.000+00:00\",\n" + " \"deliveryDate\": \"2018-03-03T23:00:00.000+00:00\",\n" + + " \"detailedDeliveryPeriodFrom\": \"2017-03-03T13:00:00.000+00:00\",\n" + + " \"detailedDeliveryPeriodTo\": \"2017-03-04T13:00:00.000+00:00\",\n" + " \"sender\": {\n" + " \"name\": \"Lieferant GmbH\",\n" + " \"zip\": \"80333\",\n" + @@ -162,7 +164,15 @@ public class DeSerializationTest extends ResourceCase { TransactionCalculator tc = new TransactionCalculator(fromJSON); assertEquals(tc.getGrandTotal(), new BigDecimal("234.43")); assertEquals(fromJSON.getNumber(), fromJSON.getNumber()); + + ZUGFeRD2PullProvider zf2p = new ZUGFeRD2PullProvider(); + zf2p.setProfile(Profiles.getByName("XRechnung")); + zf2p.generateXML(fromJSON); + String theXML = new String(zf2p.getXML(), StandardCharsets.UTF_8); + assertEquals(fromJSON.getZFItems().length, fromJSON.getZFItems().length); + assertTrue(theXML.contains("20170303")); + assertTrue(theXML.contains("20170304")); }