From 36ec2f683695fc4c02662eac7d0f97ed12d67a30 Mon Sep 17 00:00:00 2001 From: Alexander Berndt Date: Thu, 18 Jun 2020 11:48:19 +0200 Subject: [PATCH] Added getTaxTotalAmount() to ZUGFeRDImporter.java Added Test --- .../mustangproject/ZUGFeRD/ZUGFeRDImporter.java | 17 +++++++++++++++++ .../org/mustangproject/ZUGFeRD/ZF2Test.java | 1 + 2 files changed, 18 insertions(+) diff --git a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java index e8dcc76a..71484a67 100644 --- a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java +++ b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java @@ -345,6 +345,23 @@ public class ZUGFeRDImporter { } } + /** + * @return the TaxTotalAmount + */ + public String getTaxTotalAmount() { + try { + if (getVersion() == 1) { + return wExtractString("//SpecifiedTradeSettlementMonetarySummation//TaxTotalAmount"); + } else { + return wExtractString("//SpecifiedTradeSettlementHeaderMonetarySummation//TaxTotalAmount"); + } + } catch (Exception e) { + e.printStackTrace(); + return ""; + } + } + + /** * @return the line Total Amount */ diff --git a/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java b/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java index affa73d7..4f732625 100644 --- a/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java +++ b/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java @@ -216,6 +216,7 @@ public class ZF2Test extends MustangReaderTestCase { assertEquals(zi.getPaymentTerms(), "Zahlbar ohne Abzug bis zum 30.05.2017"); assertEquals(zi.getLineTotalAmount(), "496.00"); assertEquals(zi.getTaxBasisTotalAmount(), "496.00"); + assertEquals(zi.getTaxTotalAmount(),"75.04"); assertEquals(zi.getBuyerTradePartyID(), "DE999999999"); assertEquals(zi.getHolder(), getOwnOrganisationName()); assertEquals(zi.getDocumentCode(),"380");