From 5144758c2f1d9d53a9901513a8f4ba3aec2c2252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20Sta=CC=88rk?= Date: Thu, 24 Sep 2020 18:33:01 +0200 Subject: [PATCH] set BuyerOrderReferencedDocument and correct TypeCode for correction --- library/src/main/java/org/mustangproject/Invoice.java | 4 +++- .../java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java | 4 ++-- .../ZUGFeRD/model/DocumentCodeTypeConstants.java | 1 + .../src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/library/src/main/java/org/mustangproject/Invoice.java b/library/src/main/java/org/mustangproject/Invoice.java index c0473b94..ddbaa76f 100644 --- a/library/src/main/java/org/mustangproject/Invoice.java +++ b/library/src/main/java/org/mustangproject/Invoice.java @@ -21,6 +21,7 @@ package org.mustangproject; import org.mustangproject.ZUGFeRD.*; +import org.mustangproject.ZUGFeRD.model.DocumentCodeTypeConstants; import java.math.BigDecimal; import java.util.ArrayList; @@ -87,7 +88,8 @@ public class Invoice implements IExportableTransaction { * @return */ public Invoice setCorrection(String number) { - + setBuyerOrderReferencedDocumentID(number); + documentCode= DocumentCodeTypeConstants.CORRECTEDINVOICE; return this; } diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java index 1db437d1..135dd1ef 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java @@ -35,6 +35,7 @@ import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; +import org.mustangproject.Invoice; import org.mustangproject.XMLTools; public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider { @@ -213,8 +214,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider { return xml; } - - @Override + @Override public void generateXML(IExportableTransaction trans) { this.trans = trans; diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/model/DocumentCodeTypeConstants.java b/library/src/main/java/org/mustangproject/ZUGFeRD/model/DocumentCodeTypeConstants.java index 028c7874..96855ea4 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/model/DocumentCodeTypeConstants.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/model/DocumentCodeTypeConstants.java @@ -21,5 +21,6 @@ package org.mustangproject.ZUGFeRD.model; public class DocumentCodeTypeConstants { public static final String INVOICE = "380"; public static final String DEBITNOTE = "84"; + public static final String CORRECTEDINVOICE = "384"; public static final String CREDITNOTE = "389"; } diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java index 147aeead..5891c022 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java @@ -250,7 +250,7 @@ public class ZF2PushTest extends TestCase { ZUGFeRDImporter zi = new ZUGFeRDImporter(TARGET_CORRECTIONPDF); assertTrue(zi.getUTF8().contains("EUR")); - +//totest: typecode 384, BuyerOrderReferencedDocument // Reading ZUGFeRD assertEquals("-3.57", zi.getAmount()); assertEquals(zi.getHolder(), orgname);