From 191debf7e45e89a5081832f1dc40f9a846a7215e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20Sta=CC=88rk?= Date: Sun, 13 Oct 2019 18:23:49 +0200 Subject: [PATCH] implement tax category codes second step --- History.md | 1 + .../org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java | 5 +++-- src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/History.md b/History.md index 080769d7..00edf1ed 100644 --- a/History.md +++ b/History.md @@ -4,6 +4,7 @@ - support Sepa Direct Debit - closes #134 ZUGFeRD2PullProvider uses NetPrice for GrossPrice +- support intra community supply (=vat category codes) 1.7.4 ===== diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java index 53fcebab..359c6c00 100644 --- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java +++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java @@ -215,6 +215,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider { this.trans = trans; boolean hasDueDate=false; + String taxCategoryCode=""; SimpleDateFormat germanDateFormat = new SimpleDateFormat("dd.MM.yyyy"); //$NON-NLS-1$ SimpleDateFormat zugferdDateFormat = new SimpleDateFormat("yyyyMMdd"); //$NON-NLS-1$ @@ -277,7 +278,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider { int lineID = 0; for (IZUGFeRDExportableItem currentItem : trans.getZFItems()) { lineID++; - + taxCategoryCode=currentItem.getProduct().getTaxCategoryCode(); LineCalc lc = new LineCalc(currentItem); xml = xml + " \n" + //$NON-NLS-1$ " \n" //$NON-NLS-1$ @@ -446,7 +447,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider { + "\n" //$NON-NLS-1$ //currencyID=\"EUR\" + " VAT\n" //$NON-NLS-1$ + " " + currencyFormat(amount.getBasis()) + "\n" // currencyID=\"EUR\" - + " S\n" //$NON-NLS-1$ + + " "+taxCategoryCode+"\n" //$NON-NLS-1$ + " " + vatFormat(currentTaxPercent) //$NON-NLS-1$ + "\n" + " \n"; //$NON-NLS-2$ diff --git a/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java b/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java index 10870c3b..b68f5bd2 100644 --- a/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java +++ b/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java @@ -189,7 +189,7 @@ public class ZF2EdgeTest extends MustangReaderTestCase implements IZUGFeRDExport @Override public IZUGFeRDExportableItem[] getZFItems() { - Item[] allItems = new Item[2]; + Item[] allItems = new Item[3]; EdgeProduct designProduct = new EdgeProduct("", "Künstlerische Gestaltung (Stunde): Einer Beispielrechnung", "HUR"); EdgeProduct balloonProduct = new EdgeProduct("", "Bestellerweiterung für E&F Umbau", "C62");// test for issue