From 399d671f19ef132b9e1d7f9392c89d805c5757ac Mon Sep 17 00:00:00 2001 From: jstaerk Date: Thu, 1 Oct 2020 13:55:26 +0200 Subject: [PATCH] Taxnumber correction --- .../org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java | 7 +++++++ .../test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java index f3709e01..3e3b18d2 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java @@ -263,6 +263,13 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { + "\n" + " \n"; } + if (party.getTaxID() != null) { + xml += " \n" + + " " + XMLTools.encodeXML(party.getTaxID()) + + "\n" + + " \n"; + + } return xml; } diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java index c0bb2fce..5a4d33c5 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java @@ -86,6 +86,7 @@ public class ZF2PushTest extends TestCase { String orgname = "Test company"; String number = "123"; String amountStr = "1.00"; + String taxID="9990815"; BigDecimal amount = new BigDecimal(amountStr); try (InputStream SOURCE_PDF = this.getClass() .getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf"); @@ -97,7 +98,7 @@ public class ZF2PushTest extends TestCase { byte[] b={12,13}; ze.attachFile("one.pdf", b, "Application/PDF", "Alternative"); ze.attachFile("two.pdf", b, "Application/PDF", "Alternative"); - ze.setTransaction(new Invoice().setDueDate(new Date()).setIssueDate(new Date()).setDeliveryDate(new Date()).setSender(new TradeParty(orgname,"teststr", "55232","teststadt","DE").addTaxID("0815")).setOwnVATID("DE0815").setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE").addVATID("DE4711").setContact(new Contact("Franz Müller","01779999999", "franz@mueller.de", "teststr. 12", "55232", "Entenhausen", "DE"))).setNumber(number).addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), amount, new BigDecimal(1.0))) + ze.setTransaction(new Invoice().setDueDate(new Date()).setIssueDate(new Date()).setDeliveryDate(new Date()).setSender(new TradeParty(orgname,"teststr", "55232","teststadt","DE").addTaxID(taxID)).setOwnVATID("DE0815").setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE").addVATID("DE4711").setContact(new Contact("Franz Müller","01779999999", "franz@mueller.de", "teststr. 12", "55232", "Entenhausen", "DE"))).setNumber(number).addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), amount, new BigDecimal(1.0))) ); String theXML = new String(ze.getProvider().getXML()); @@ -111,6 +112,7 @@ public class ZF2PushTest extends TestCase { ZUGFeRDImporter zi = new ZUGFeRDImporter(TARGET_ATTACHMENTSPDF); assertTrue(zi.getUTF8().contains("EUR")); + assertTrue(zi.getUTF8().contains(taxID)); // Reading ZUGFeRD assertEquals("1.19", zi.getAmount());