From ec6159c490852d55f7fbdb64682b94487ef78159 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Mon, 26 Oct 2015 11:30:17 +0100
Subject: [PATCH 01/15] Increased version string in ZUGFeRDExporter

---
 .../main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index cdbc2ed3..5e79f159 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -103,7 +103,7 @@ public class ZUGFeRDExporter {
 
     //// MAIN CLASS
     private String conformanceLevel = "U";
-    private String versionStr = "1.2.0";
+    private String versionStr = "1.3.0";
 
     // BASIC, COMFORT etc - may be set from outside.
     private String ZUGFeRDConformanceLevel = null;

From 1a956c289d05e7e6218bb8d85f29016c9dea3a33 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Mon, 26 Oct 2015 13:25:01 +0100
Subject: [PATCH 02/15] fixed UTF-8 encoding for output XML

---
 mustang/pom.xml                                               | 2 +-
 .../main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mustang/pom.xml b/mustang/pom.xml
index d7686705..9d09a237 100644
--- a/mustang/pom.xml
+++ b/mustang/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.github.rayman2200</groupId>
         <artifactId>mustang-sample-project</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.mustangproject.ZUGFeRD</groupId>
diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index 5e79f159..123ab278 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -72,7 +72,7 @@ public class ZUGFeRDExporter {
         jaxbContext = JAXBContext.newInstance("org.mustangproject.ZUGFeRD.model");
         marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-        marshaller.setProperty("jaxb.encoding", "UTF-8");
+        marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
     }
 
     private class LineCalc {
@@ -749,7 +749,7 @@ public class ZUGFeRDExporter {
             // create a dummy file stream, this would probably normally be a
             // FileInputStream
 
-            byte[] zugferdRaw = getZugferdXMLForTransaction(trans).getBytes("UTF-8"); //$NON-NLS-1$
+            byte[] zugferdRaw = getZugferdXMLForTransaction(trans).getBytes(); //$NON-NLS-1$
 
             if ((zugferdRaw[0] == (byte) 0xEF) && (zugferdRaw[1] == (byte) 0xBB) && (zugferdRaw[2] == (byte) 0xBF)) {
                 // I don't like BOMs, lets remove it

From d22754a4b08e6ceaf22023898404659239262fc0 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Fri, 6 Nov 2015 16:11:07 +0100
Subject: [PATCH 03/15] Fix item missing Tax code and category code

---
 .../org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index 123ab278..c9323b34 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -326,6 +326,10 @@ public class ZUGFeRDExporter {
         documentCodeType.setValue(DocumentCodeType.INVOICE);
         document.setTypeCode(documentCodeType);
 
+        TextType name = xmlFactory.createTextType();
+        name.setValue("RECHNUNG");
+        document.getName().add(name);
+        
         if (trans.getOwnOrganisationFullPlaintextInfo() != null) {
             NoteType regularInfo = xmlFactory.createNoteType();
             CodeType regularInfoSubjectCode = xmlFactory.createCodeType();
@@ -653,6 +657,15 @@ public class ZUGFeRDExporter {
 
             SupplyChainTradeSettlementType tradeSettlement = xmlFactory.createSupplyChainTradeSettlementType();
             TradeTaxType tradeTax = xmlFactory.createTradeTaxType();
+            
+            TaxCategoryCodeType taxCategoryCode = xmlFactory.createTaxCategoryCodeType();
+            taxCategoryCode.setValue(TaxCategoryCodeType.STANDARDRATE);
+            tradeTax.setCategoryCode(taxCategoryCode);
+            
+            TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType();
+            taxCode.setValue(TaxTypeCodeType.SALESTAX);
+            tradeTax.setTypeCode(taxCode);
+            
             PercentType taxPercent = xmlFactory.createPercentType();
             taxPercent.setValue(vatFormat(currentItem.getProduct().getVATPercent()));
             tradeTax.setApplicablePercent(taxPercent);

From 02351564d6c584f3154ffe0bdbd4864ecf3da9e0 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Fri, 6 Nov 2015 16:20:03 +0100
Subject: [PATCH 04/15] Fix item prices need to have 4 decimal places instead
 of 2

---
 .../main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index c9323b34..8b400e88 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -630,7 +630,7 @@ public class ZUGFeRDExporter {
 
             AmountType grossChargeAmount = xmlFactory.createAmountType();
             grossChargeAmount.setCurrencyID(trans.getInvoiceCurrency());
-            grossChargeAmount.setValue(currencyFormat(currentItem.getPrice()));
+            grossChargeAmount.setValue(priceFormat(currentItem.getPrice()));
             grossTradePrice.getChargeAmount().add(grossChargeAmount);
             tradeAgreement.getGrossPriceProductTradePrice().add(grossTradePrice);
 
@@ -642,7 +642,7 @@ public class ZUGFeRDExporter {
 
             AmountType netChargeAmount = xmlFactory.createAmountType();
             netChargeAmount.setCurrencyID(trans.getInvoiceCurrency());
-            netChargeAmount.setValue(currencyFormat(currentItem.getPrice()));
+            netChargeAmount.setValue(priceFormat(currentItem.getPrice()));
             netTradePrice.getChargeAmount().add(netChargeAmount);
             tradeAgreement.getNetPriceProductTradePrice().add(netTradePrice);
 

From 88ca559899375dbc394c5ae74e3d3f62cb71d085 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Mon, 9 Nov 2015 10:16:18 +0100
Subject: [PATCH 05/15] use latest PDFBOX 1.8.10 version

---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34fb73e1..5bb6a839 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,13 +2,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.rayman2200</groupId>
 	<artifactId>mustang-sample-project</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<scm>
-		<connection>scm:git:https://github.com/Rayman2200/PDFA3.git</connection>
-		<developerConnection>scm:git:https://github.com/Rayman2200/PDFA3.git</developerConnection>
-		<url>https://github.com/Rayman2200/PDFA3</url>
+		<connection>scm:git:https://github.com/AlexanderSchmidt/PDFA3.git</connection>
+		<developerConnection>scm:git:https://github.com/AlexanderSchmidt/PDFA3.git</developerConnection>
+		<url>https://github.com/AlexanderSchmidt/PDFA3.git</url>
 		<tag>HEAD</tag>
 	</scm>
 
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>org.apache.pdfbox</groupId>
 			<artifactId>pdfbox</artifactId>
-			<version>1.8.8</version>
+			<version>1.8.10</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -77,7 +77,7 @@
 					</includes>
 					<merge>true</merge>
 					<repositoryName>PDFA3</repositoryName>      <!-- github repo name -->
-					<repositoryOwner>Rayman2200</repositoryOwner>    <!-- github username -->
+					<repositoryOwner>AlexanderSchmidt</repositoryOwner>    <!-- github username -->
 				</configuration>
 				<executions>
 					<!-- run site-maven-plugin's 'site' target as part of the build's normal 

From 74b08e0a2ff26d7f51dbabbed61f44c89318c5b9 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Tue, 10 Nov 2015 13:57:27 +0100
Subject: [PATCH 06/15] first implementation of header allowances

---
 .../ZUGFeRD/IZUGFeRDAllowanceCharge.java      | 31 ++++++++++++++
 .../IZUGFeRDExportableTransaction.java        |  4 ++
 .../ZUGFeRD/ZUGFeRDExporter.java              | 40 ++++++++++++++++++-
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDAllowanceCharge.java

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDAllowanceCharge.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDAllowanceCharge.java
new file mode 100644
index 00000000..040cda54
--- /dev/null
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDAllowanceCharge.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 AlexanderSchmidt.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.mustangproject.ZUGFeRD;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ * @author AlexanderSchmidt
+ */
+public interface IZUGFeRDAllowanceCharge {
+    BigDecimal getAmount();
+    
+    String getReason();
+    
+    BigDecimal getTaxPercent();
+    
+}
diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableTransaction.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableTransaction.java
index 00545145..09ab90d6 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableTransaction.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableTransaction.java
@@ -45,6 +45,10 @@ public interface IZUGFeRDExportableTransaction {
 	 * @return
 	 */
 	Date getDueDate();
+        
+        IZUGFeRDAllowanceCharge[] getZFAllowances();
+        IZUGFeRDAllowanceCharge[] getZFCharges();
+        IZUGFeRDAllowanceCharge[] getZFLogisticsServiceCharges();        
 
 	IZUGFeRDExportableItem[] getZFItems();
 
diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index 8b400e88..ca01a1bb 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -476,6 +476,7 @@ public class ZUGFeRDExporter {
         tradeSettlement.getSpecifiedTradeSettlementPaymentMeans().add(this.getPaymentData());
         tradeSettlement.getApplicableTradeTax().addAll(this.getTradeTax());
         tradeSettlement.getSpecifiedTradePaymentTerms().addAll(this.getPaymentTerms());
+        tradeSettlement.getSpecifiedTradeAllowanceCharge().addAll(this.getHeaderAllowances());
         tradeSettlement.setSpecifiedTradeSettlementMonetarySummation(this.getMonetarySummation());
 
         return tradeSettlement;
@@ -545,6 +546,43 @@ public class ZUGFeRDExporter {
         return tradeTaxTypes;
     }
 
+    private Collection<TradeAllowanceChargeType> getHeaderAllowances() {
+        List<TradeAllowanceChargeType> headerAllowances = new ArrayList<TradeAllowanceChargeType>();
+
+        for (IZUGFeRDAllowanceCharge iAllowance : trans.getZFAllowances()) {
+            
+            TradeAllowanceChargeType allowance = xmlFactory.createTradeAllowanceChargeType();
+            
+            IndicatorType chargeIndicator = xmlFactory.createIndicatorType();
+            chargeIndicator.setIndicator(false);
+            allowance.setChargeIndicator(chargeIndicator);
+            
+            TextType reason = xmlFactory.createTextType();
+            reason.setValue(iAllowance.getReason());
+            allowance.setReason(reason);
+            
+            TradeTaxType tradeTax = xmlFactory.createTradeTaxType();
+            
+            PercentType vatPercent = xmlFactory.createPercentType();
+            vatPercent.setValue(iAllowance.getTaxPercent());
+            tradeTax.setApplicablePercent(vatPercent);
+            
+            TaxCategoryCodeType taxType = xmlFactory.createTaxCategoryCodeType();
+            taxType.setValue(TaxCategoryCodeType.STANDARDRATE);
+            tradeTax.setCategoryCode(taxType);
+            
+            TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType();
+            taxCode.setValue(TaxTypeCodeType.SALESTAX);
+            tradeTax.setTypeCode(taxCode);
+            
+            allowance.getCategoryTradeTax().add(tradeTax);
+            headerAllowances.add(allowance);
+            
+        }
+
+        return headerAllowances;
+    }
+
     private Collection<TradePaymentTermsType> getPaymentTerms() {
         List<TradePaymentTermsType> paymentTerms = new ArrayList<TradePaymentTermsType>();
 
@@ -564,7 +602,7 @@ public class ZUGFeRDExporter {
         paymentTerms.add(paymentTerm);
 
         return paymentTerms;
-    }
+    }    
 
     private TradeSettlementMonetarySummationType getMonetarySummation() {
         TradeSettlementMonetarySummationType monetarySummation = xmlFactory.createTradeSettlementMonetarySummationType();

From f3956f22494bd89763fc09d607fe7a9438e8a8e6 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Tue, 10 Nov 2015 13:59:56 +0100
Subject: [PATCH 07/15] first implementation of header allowances

---
 .../ZUGFeRD/MustangReaderWriterEdgeTest.java  | 15 ++++++++++++
 .../ZUGFeRD/MustangReaderWriterTest.java      | 18 ++++++++++++++
 nbactions.xml                                 | 24 +++++++++++++++++++
 pdfa3-sample/pom.xml                          |  2 +-
 4 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 nbactions.xml

diff --git a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
index bce0eb04..3a23416d 100644
--- a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
+++ b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
@@ -149,6 +149,21 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
         return "Zahlbar ohne Abzug bis zum " + germanDateFormat.format(getDueDate());
     }
 
+    @Override
+    public IZUGFeRDAllowanceCharge[] getZFAllowances() {
+        return null;
+    }
+
+    @Override
+    public IZUGFeRDAllowanceCharge[] getZFCharges() {
+        return null;
+    }
+
+    @Override
+    public IZUGFeRDAllowanceCharge[] getZFLogisticsServiceCharges() {
+        return null;
+    }
+
   class Contact implements IZUGFeRDExportableContact
   {
 
diff --git a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
index 4f06df2d..0a96bf94 100644
--- a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
+++ b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
@@ -148,6 +148,24 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
         return "Zahlbar ohne Abzug bis zum " + germanDateFormat.format(getDueDate());
     }
 
+    @Override
+    public IZUGFeRDAllowanceCharge[] getZFAllowances() {
+        return null;
+        //throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public IZUGFeRDAllowanceCharge[] getZFCharges() {
+        return null;
+        //throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public IZUGFeRDAllowanceCharge[] getZFLogisticsServiceCharges() {
+        return null;
+        //throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
   class Contact implements IZUGFeRDExportableContact
   {
 
diff --git a/nbactions.xml b/nbactions.xml
new file mode 100644
index 00000000..12165706
--- /dev/null
+++ b/nbactions.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>CUSTOM-Generate mvn-repo</actionName>
+            <displayName>Generate mvn-repo</displayName>
+            <goals>
+                <goal>site:deploy</goal>
+            </goals>
+        </action>
+        <action>
+            <actionName>CUSTOM-mvn-repo</actionName>
+            <displayName>mvn-repo</displayName>
+            <goals>
+                <goal>site</goal>
+            </goals>
+        </action>
+        <action>
+            <actionName>CUSTOM-deploy</actionName>
+            <displayName>deploy</displayName>
+            <goals>
+                <goal>deploy</goal>
+            </goals>
+        </action>
+    </actions>
diff --git a/pdfa3-sample/pom.xml b/pdfa3-sample/pom.xml
index f7edda0a..aa81da5c 100644
--- a/pdfa3-sample/pom.xml
+++ b/pdfa3-sample/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.github.rayman2200</groupId>
     <artifactId>mustang-sample-project</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
 
 	<artifactId>pdfa3-samples</artifactId>

From b26bcfd2436d62cbe104ad424195f2c04406a4d4 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Tue, 10 Nov 2015 14:02:19 +0100
Subject: [PATCH 08/15] first implementation of header allowances

---
 .../main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index ca01a1bb..e3a4367c 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -476,7 +476,9 @@ public class ZUGFeRDExporter {
         tradeSettlement.getSpecifiedTradeSettlementPaymentMeans().add(this.getPaymentData());
         tradeSettlement.getApplicableTradeTax().addAll(this.getTradeTax());
         tradeSettlement.getSpecifiedTradePaymentTerms().addAll(this.getPaymentTerms());
-        tradeSettlement.getSpecifiedTradeAllowanceCharge().addAll(this.getHeaderAllowances());
+        if(trans.getZFAllowances() != null){
+            tradeSettlement.getSpecifiedTradeAllowanceCharge().addAll(this.getHeaderAllowances());
+        }
         tradeSettlement.setSpecifiedTradeSettlementMonetarySummation(this.getMonetarySummation());
 
         return tradeSettlement;

From bb8bb383af001694af74579c1d3757f14accdfeb Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Tue, 10 Nov 2015 16:08:36 +0100
Subject: [PATCH 09/15] first implementation of header allowances

---
 .../org/mustangproject/ZUGFeRD/VATAmount.java | 48 +++++++-------
 .../ZUGFeRD/ZUGFeRDExporter.java              | 64 +++++++++++++++++--
 2 files changed, 83 insertions(+), 29 deletions(-)

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/VATAmount.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/VATAmount.java
index f1982b40..2c7eac5e 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/VATAmount.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/VATAmount.java
@@ -4,32 +4,36 @@ import java.math.BigDecimal;
 
 public class VATAmount {
 
-	public VATAmount(BigDecimal basis, BigDecimal calculated) {
-		super();
-		this.basis = basis;
-		this.calculated = calculated;
-	}
+    public VATAmount(BigDecimal basis, BigDecimal calculated) {
+        super();
+        this.basis = basis;
+        this.calculated = calculated;
+    }
 
-	BigDecimal basis, calculated;
+    BigDecimal basis, calculated;
 
-	public BigDecimal getBasis() {
-		return basis;
-	}
+    public BigDecimal getBasis() {
+        return basis;
+    }
 
-	public void setBasis(BigDecimal basis) {
-		this.basis = basis;
-	}
+    public void setBasis(BigDecimal basis) {
+        this.basis = basis;
+    }
 
-	public BigDecimal getCalculated() {
-		return calculated;
-	}
+    public BigDecimal getCalculated() {
+        return calculated;
+    }
 
-	public void setCalculated(BigDecimal calculated) {
-		this.calculated = calculated;
-	}
-	
-	public VATAmount add(VATAmount v) {
-		return new VATAmount(basis.add(v.getBasis()), calculated.add(v.getCalculated()));
-	}
+    public void setCalculated(BigDecimal calculated) {
+        this.calculated = calculated;
+    }
+
+    public VATAmount add(VATAmount v) {
+        return new VATAmount(basis.add(v.getBasis()), calculated.add(v.getCalculated()));
+    }
+
+    public VATAmount subtract(VATAmount v) {
+        return new VATAmount(basis.subtract(v.getBasis()), calculated.subtract(v.getCalculated()));
+    }
 
 }
diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index e3a4367c..07cbd183 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -550,7 +550,8 @@ public class ZUGFeRDExporter {
 
     private Collection<TradeAllowanceChargeType> getHeaderAllowances() {
         List<TradeAllowanceChargeType> headerAllowances = new ArrayList<TradeAllowanceChargeType>();
-
+        
+        HashMap<BigDecimal, VATAmount> VATPercentAmountMap = this.getVATPercentAmountMap();
         for (IZUGFeRDAllowanceCharge iAllowance : trans.getZFAllowances()) {
             
             TradeAllowanceChargeType allowance = xmlFactory.createTradeAllowanceChargeType();
@@ -559,6 +560,11 @@ public class ZUGFeRDExporter {
             chargeIndicator.setIndicator(false);
             allowance.setChargeIndicator(chargeIndicator);
             
+            AmountType actualAmount = xmlFactory.createAmountType();
+            actualAmount.setCurrencyID(trans.getInvoiceCurrency());       
+            actualAmount.setValue(currencyFormat(iAllowance.getAmount()));
+            allowance.getActualAmount().add(actualAmount);
+            
             TextType reason = xmlFactory.createTextType();
             reason.setValue(iAllowance.getReason());
             allowance.setReason(reason);
@@ -566,9 +572,17 @@ public class ZUGFeRDExporter {
             TradeTaxType tradeTax = xmlFactory.createTradeTaxType();
             
             PercentType vatPercent = xmlFactory.createPercentType();
-            vatPercent.setValue(iAllowance.getTaxPercent());
+            vatPercent.setValue(currencyFormat(iAllowance.getTaxPercent()));
             tradeTax.setApplicablePercent(vatPercent);
             
+            VATAmount amount = VATPercentAmountMap.get(iAllowance.getTaxPercent());
+
+            /* Only in extended
+            AmountType basisAmount = xmlFactory.createAmountType();
+            basisAmount.setCurrencyID(trans.getInvoiceCurrency());       
+            basisAmount.setValue(amount.getBasis());
+            allowance.setBasisAmount(basisAmount);
+            */
             TaxCategoryCodeType taxType = xmlFactory.createTaxCategoryCodeType();
             taxType.setValue(TaxCategoryCodeType.STANDARDRATE);
             tradeTax.setCategoryCode(taxType);
@@ -610,7 +624,16 @@ public class ZUGFeRDExporter {
         TradeSettlementMonetarySummationType monetarySummation = xmlFactory.createTradeSettlementMonetarySummationType();
         AmountType allowanceTotalAmount = xmlFactory.createAmountType();
         allowanceTotalAmount.setCurrencyID(trans.getInvoiceCurrency());
-        allowanceTotalAmount.setValue(currencyFormat(BigDecimal.ZERO));
+        if(trans.getZFAllowances() != null){
+            BigDecimal totalHeaderAllowance = BigDecimal.ZERO;
+            for(IZUGFeRDAllowanceCharge headerAllowance : trans.getZFAllowances()){
+                totalHeaderAllowance = headerAllowance.getAmount().add(totalHeaderAllowance);
+            }
+            allowanceTotalAmount.setValue(currencyFormat(totalHeaderAllowance));
+        }else{
+            allowanceTotalAmount.setValue(currencyFormat(BigDecimal.ZERO));           
+        }
+
         monetarySummation.getAllowanceTotalAmount().add(allowanceTotalAmount);
 
         AmountType chargeTotalAmount = xmlFactory.createAmountType();
@@ -620,7 +643,7 @@ public class ZUGFeRDExporter {
 
         AmountType lineTotalAmount = xmlFactory.createAmountType();
         lineTotalAmount.setCurrencyID(trans.getInvoiceCurrency());
-        lineTotalAmount.setValue(currencyFormat(this.getTotal()));
+        lineTotalAmount.setValue(currencyFormat(this.getLineTotal()));
         monetarySummation.getLineTotalAmount().add(lineTotalAmount);
 
         AmountType taxBasisTotalAmount = xmlFactory.createAmountType();
@@ -749,12 +772,28 @@ public class ZUGFeRDExporter {
         return res;
     }
 
-    private BigDecimal getTotal() {
-        BigDecimal res = new BigDecimal(0);
+    private BigDecimal getLineTotal() {
+        BigDecimal res = BigDecimal.ZERO;        
         for (IZUGFeRDExportableItem currentItem : trans.getZFItems()) {
             LineCalc lc = new LineCalc(currentItem);
             res = res.add(lc.getItemTotalNetAmount());
         }
+        
+        return res;
+    }
+    
+    private BigDecimal getTotal() {
+        BigDecimal res = BigDecimal.ZERO;        
+        for (IZUGFeRDExportableItem currentItem : trans.getZFItems()) {
+            LineCalc lc = new LineCalc(currentItem);
+            res = res.add(lc.getItemTotalNetAmount());
+        }
+        if(trans.getZFAllowances() != null){
+            for (IZUGFeRDAllowanceCharge headerAllowance : trans.getZFAllowances()){
+                res = res.subtract(headerAllowance.getAmount());
+            }
+        }
+              
         return res;
     }
 
@@ -779,7 +818,18 @@ public class ZUGFeRDExporter {
                 hm.put(percent, itemVATAmount);
             } else {
                 hm.put(percent, current.add(itemVATAmount));
-
+            }
+        }
+        if(trans.getZFAllowances() != null){
+            for (IZUGFeRDAllowanceCharge headerAllowance : trans.getZFAllowances()){
+                BigDecimal percent = headerAllowance.getTaxPercent();
+                VATAmount itemVATAmount = new VATAmount(headerAllowance.getAmount(), headerAllowance.getAmount().multiply(percent).divide(new BigDecimal(100)));
+                VATAmount current = hm.get(percent);
+                if (current == null) {
+                    hm.put(percent, itemVATAmount);
+                } else {
+                    hm.put(percent, current.subtract(itemVATAmount));
+                }
             }
         }
 

From b5cc1eee7f32462012f8362bcc2b061db45ace99 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Thu, 12 Nov 2015 16:02:00 +0100
Subject: [PATCH 10/15] implementation of header charged and header logistics
 service charges

---
 .../ZUGFeRD/ZUGFeRDExporter.java              | 182 +++++++++++++++++-
 1 file changed, 173 insertions(+), 9 deletions(-)

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index 07cbd183..d00ad9d6 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -479,6 +479,13 @@ public class ZUGFeRDExporter {
         if(trans.getZFAllowances() != null){
             tradeSettlement.getSpecifiedTradeAllowanceCharge().addAll(this.getHeaderAllowances());
         }
+        if(trans.getZFLogisticsServiceCharges()!= null){
+            tradeSettlement.getSpecifiedLogisticsServiceCharge().addAll(this.getHeaderLogisticsServiceCharges());
+        }
+        if(trans.getZFCharges()!= null){
+            tradeSettlement.getSpecifiedTradeAllowanceCharge().addAll(this.getHeaderCharges());
+        }
+        
         tradeSettlement.setSpecifiedTradeSettlementMonetarySummation(this.getMonetarySummation());
 
         return tradeSettlement;
@@ -550,8 +557,7 @@ public class ZUGFeRDExporter {
 
     private Collection<TradeAllowanceChargeType> getHeaderAllowances() {
         List<TradeAllowanceChargeType> headerAllowances = new ArrayList<TradeAllowanceChargeType>();
-        
-        HashMap<BigDecimal, VATAmount> VATPercentAmountMap = this.getVATPercentAmountMap();
+       
         for (IZUGFeRDAllowanceCharge iAllowance : trans.getZFAllowances()) {
             
             TradeAllowanceChargeType allowance = xmlFactory.createTradeAllowanceChargeType();
@@ -574,8 +580,6 @@ public class ZUGFeRDExporter {
             PercentType vatPercent = xmlFactory.createPercentType();
             vatPercent.setValue(currencyFormat(iAllowance.getTaxPercent()));
             tradeTax.setApplicablePercent(vatPercent);
-            
-            VATAmount amount = VATPercentAmountMap.get(iAllowance.getTaxPercent());
 
             /* Only in extended
             AmountType basisAmount = xmlFactory.createAmountType();
@@ -598,6 +602,100 @@ public class ZUGFeRDExporter {
 
         return headerAllowances;
     }
+    
+    private Collection<TradeAllowanceChargeType> getHeaderCharges() {
+        List<TradeAllowanceChargeType> headerCharges = new ArrayList<TradeAllowanceChargeType>();
+        
+        for (IZUGFeRDAllowanceCharge iCharge : trans.getZFCharges()) {
+            
+            TradeAllowanceChargeType charge = xmlFactory.createTradeAllowanceChargeType();
+            
+            IndicatorType chargeIndicator = xmlFactory.createIndicatorType();
+            chargeIndicator.setIndicator(true);
+            charge.setChargeIndicator(chargeIndicator);
+            
+            AmountType actualAmount = xmlFactory.createAmountType();
+            actualAmount.setCurrencyID(trans.getInvoiceCurrency());       
+            actualAmount.setValue(currencyFormat(iCharge.getAmount()));
+            charge.getActualAmount().add(actualAmount);
+            
+            TextType reason = xmlFactory.createTextType();
+            reason.setValue(iCharge.getReason());
+            charge.setReason(reason);
+            
+            TradeTaxType tradeTax = xmlFactory.createTradeTaxType();
+            
+            PercentType vatPercent = xmlFactory.createPercentType();
+            vatPercent.setValue(currencyFormat(iCharge.getTaxPercent()));
+            tradeTax.setApplicablePercent(vatPercent);
+
+            /* Only in extended
+            AmountType basisAmount = xmlFactory.createAmountType();
+            basisAmount.setCurrencyID(trans.getInvoiceCurrency());       
+            basisAmount.setValue(amount.getBasis());
+            allowance.setBasisAmount(basisAmount);
+            */
+            TaxCategoryCodeType taxType = xmlFactory.createTaxCategoryCodeType();
+            taxType.setValue(TaxCategoryCodeType.STANDARDRATE);
+            tradeTax.setCategoryCode(taxType);
+            
+            TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType();
+            taxCode.setValue(TaxTypeCodeType.SALESTAX);
+            tradeTax.setTypeCode(taxCode);
+            
+            charge.getCategoryTradeTax().add(tradeTax);
+            headerCharges.add(charge);
+            
+        }
+
+        return headerCharges;
+    }    
+    
+    private Collection<LogisticsServiceChargeType> getHeaderLogisticsServiceCharges() {
+        List<LogisticsServiceChargeType> headerServiceCharge = new ArrayList<LogisticsServiceChargeType>();
+        
+        for (IZUGFeRDAllowanceCharge iServiceCharge : trans.getZFLogisticsServiceCharges()) {
+            
+            LogisticsServiceChargeType serviceCharge = xmlFactory.createLogisticsServiceChargeType();
+
+            AmountType actualAmount = xmlFactory.createAmountType();
+            actualAmount.setCurrencyID(trans.getInvoiceCurrency());       
+            actualAmount.setValue(currencyFormat(iServiceCharge.getAmount()));
+            serviceCharge.getAppliedAmount().add(actualAmount);
+            
+            TextType reason = xmlFactory.createTextType();
+            reason.setValue(iServiceCharge.getReason());
+            serviceCharge.getDescription().add(reason);
+            
+            TradeTaxType tradeTax = xmlFactory.createTradeTaxType();
+            
+            PercentType vatPercent = xmlFactory.createPercentType();
+            vatPercent.setValue(currencyFormat(iServiceCharge.getTaxPercent()));            
+            tradeTax.setApplicablePercent(vatPercent);
+
+            /* Only in extended
+            AmountType basisAmount = xmlFactory.createAmountType();
+            basisAmount.setCurrencyID(trans.getInvoiceCurrency());       
+            basisAmount.setValue(amount.getBasis());
+            allowance.setBasisAmount(basisAmount);
+            */
+            TaxCategoryCodeType taxType = xmlFactory.createTaxCategoryCodeType();
+            taxType.setValue(TaxCategoryCodeType.STANDARDRATE);
+            tradeTax.setCategoryCode(taxType);
+            
+            TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType();
+            taxCode.setValue(TaxTypeCodeType.SALESTAX);
+            tradeTax.setTypeCode(taxCode);
+            
+
+            
+            serviceCharge.getAppliedTradeTax().add(tradeTax);
+            headerServiceCharge.add(serviceCharge);
+            
+        }
+
+        return headerServiceCharge;
+    }    
 
     private Collection<TradePaymentTermsType> getPaymentTerms() {
         List<TradePaymentTermsType> paymentTerms = new ArrayList<TradePaymentTermsType>();
@@ -622,6 +720,8 @@ public class ZUGFeRDExporter {
 
     private TradeSettlementMonetarySummationType getMonetarySummation() {
         TradeSettlementMonetarySummationType monetarySummation = xmlFactory.createTradeSettlementMonetarySummationType();
+        
+        // AllowanceTotalAmount = sum of all allowances
         AmountType allowanceTotalAmount = xmlFactory.createAmountType();
         allowanceTotalAmount.setCurrencyID(trans.getInvoiceCurrency());
         if(trans.getZFAllowances() != null){
@@ -633,13 +733,31 @@ public class ZUGFeRDExporter {
         }else{
             allowanceTotalAmount.setValue(currencyFormat(BigDecimal.ZERO));           
         }
+        monetarySummation.getAllowanceTotalAmount().add(allowanceTotalAmount);  
+        
+        // ChargeTotalAmount = sum of all Logistic service charges + normal charges
+        BigDecimal totalCharge = BigDecimal.ZERO;   
+        AmountType totalChargeAmount = xmlFactory.createAmountType();
+        totalChargeAmount.setCurrencyID(trans.getInvoiceCurrency());
+        if(trans.getZFLogisticsServiceCharges()!= null){
+            for(IZUGFeRDAllowanceCharge logisticsServiceCharge : trans.getZFLogisticsServiceCharges()){
+                totalCharge = logisticsServiceCharge.getAmount().add(totalCharge);
+            }          
+        }
+        if(trans.getZFCharges()!= null){
+            for(IZUGFeRDAllowanceCharge charge : trans.getZFCharges()){
+                totalCharge = charge.getAmount().add(totalCharge);
+            }
+        }
+                
+        totalChargeAmount.setValue(currencyFormat(totalCharge));
+        
+        monetarySummation.getChargeTotalAmount().add(totalChargeAmount);
 
-        monetarySummation.getAllowanceTotalAmount().add(allowanceTotalAmount);
-
-        AmountType chargeTotalAmount = xmlFactory.createAmountType();
+        /*AmountType chargeTotalAmount = xmlFactory.createAmountType();
         chargeTotalAmount.setCurrencyID(trans.getInvoiceCurrency());
         chargeTotalAmount.setValue(currencyFormat(BigDecimal.ZERO));
-        monetarySummation.getChargeTotalAmount().add(chargeTotalAmount);
+        monetarySummation.getChargeTotalAmount().add(chargeTotalAmount);*/
 
         AmountType lineTotalAmount = xmlFactory.createAmountType();
         lineTotalAmount.setCurrencyID(trans.getInvoiceCurrency());
@@ -788,11 +906,24 @@ public class ZUGFeRDExporter {
             LineCalc lc = new LineCalc(currentItem);
             res = res.add(lc.getItemTotalNetAmount());
         }
+        
         if(trans.getZFAllowances() != null){
             for (IZUGFeRDAllowanceCharge headerAllowance : trans.getZFAllowances()){
                 res = res.subtract(headerAllowance.getAmount());
             }
         }
+        
+        if(trans.getZFLogisticsServiceCharges()!= null){
+            for (IZUGFeRDAllowanceCharge logisticsServiceCharge : trans.getZFLogisticsServiceCharges()){
+                res = res.add(logisticsServiceCharge.getAmount());
+            }
+        }
+        
+        if(trans.getZFCharges()!= null){
+            for (IZUGFeRDAllowanceCharge charge : trans.getZFCharges()){
+                res = res.add(charge.getAmount());
+            }
+        }        
               
         return res;
     }
@@ -807,6 +938,10 @@ public class ZUGFeRDExporter {
      *
      */
     private HashMap<BigDecimal, VATAmount> getVATPercentAmountMap() {
+        return getVATPercentAmountMap(false);
+    }
+    
+    private HashMap<BigDecimal, VATAmount> getVATPercentAmountMap(Boolean itemOnly){
         HashMap<BigDecimal, VATAmount> hm = new HashMap<BigDecimal, VATAmount>();
 
         for (IZUGFeRDExportableItem currentItem : trans.getZFItems()) {
@@ -820,6 +955,9 @@ public class ZUGFeRDExporter {
                 hm.put(percent, current.add(itemVATAmount));
             }
         }
+        if(itemOnly){
+            return hm;
+        }
         if(trans.getZFAllowances() != null){
             for (IZUGFeRDAllowanceCharge headerAllowance : trans.getZFAllowances()){
                 BigDecimal percent = headerAllowance.getTaxPercent();
@@ -832,8 +970,34 @@ public class ZUGFeRDExporter {
                 }
             }
         }
+        
+        if(trans.getZFLogisticsServiceCharges()!= null){
+            for (IZUGFeRDAllowanceCharge logisticsServiceCharge : trans.getZFLogisticsServiceCharges()){
+                BigDecimal percent = logisticsServiceCharge.getTaxPercent();
+                VATAmount itemVATAmount = new VATAmount(logisticsServiceCharge.getAmount(), logisticsServiceCharge.getAmount().multiply(percent).divide(new BigDecimal(100)));
+                VATAmount current = hm.get(percent);
+                if (current == null) {
+                    hm.put(percent, itemVATAmount);
+                } else {
+                    hm.put(percent, current.add(itemVATAmount));
+                }
+            }
+        }
+        
+        if(trans.getZFCharges()!= null){
+            for (IZUGFeRDAllowanceCharge charge : trans.getZFCharges()){
+                BigDecimal percent = charge.getTaxPercent();
+                VATAmount itemVATAmount = new VATAmount(charge.getAmount(), charge.getAmount().multiply(percent).divide(new BigDecimal(100)));
+                VATAmount current = hm.get(percent);
+                if (current == null) {
+                    hm.put(percent, itemVATAmount);
+                } else {
+                    hm.put(percent, current.add(itemVATAmount));
+                }
+            }
+        }
 
-        return hm;
+        return hm;        
     }
 
     /**

From 12ce806ac2534240291e50fd81c7f863a00cfb07 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Mon, 16 Nov 2015 11:36:04 +0100
Subject: [PATCH 11/15] implementation of item charges and allowance

---
 .../mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java |  3 ++-
 .../ZUGFeRD/MustangReaderWriterEdgeTest.java           | 10 ++++++++++
 .../ZUGFeRD/MustangReaderWriterTest.java               | 10 ++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java
index 8054c70c..99044349 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java
@@ -13,7 +13,8 @@ import java.math.BigDecimal;
 public interface IZUGFeRDExportableItem {
 
 	IZUGFeRDExportableProduct getProduct();
-
+        IZUGFeRDAllowanceCharge[] getItemAllowances();
+        IZUGFeRDAllowanceCharge[] getItemCharges();
 
 
 	/**
diff --git a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
index 3a23416d..f75bd38b 100644
--- a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
+++ b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
@@ -251,6 +251,16 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
       this.product = product;
     }
 
+    @Override
+    public IZUGFeRDAllowanceCharge[] getItemAllowances() {
+        return null;        
+    }
+
+    @Override
+    public IZUGFeRDAllowanceCharge[] getItemCharges() {
+        return null;
+    }
+
   }
 
   class Product implements IZUGFeRDExportableProduct
diff --git a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
index 0a96bf94..e834f3c7 100644
--- a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
+++ b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
@@ -252,6 +252,16 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
     {
       this.product = product;
     }
+      
+    @Override
+    public IZUGFeRDAllowanceCharge[] getItemAllowances() {
+        return null;        
+    }
+
+    @Override
+    public IZUGFeRDAllowanceCharge[] getItemCharges() {
+        return null;
+    }    
 
   }
 

From cebcfaa8f228511e30a30d6697489bdb25eccfa4 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Mon, 16 Nov 2015 13:16:19 +0100
Subject: [PATCH 12/15] implementation of item charges and allowance

---
 .../ZUGFeRD/ZUGFeRDExporter.java              | 46 +++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index d00ad9d6..58083d2c 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -84,10 +84,22 @@ public class ZUGFeRDExporter {
 
         public LineCalc(IZUGFeRDExportableItem currentItem) {
             this.currentItem = currentItem;
-            BigDecimal multiplicator = currentItem.getProduct().getVATPercent().divide(new BigDecimal(100)).add(new BigDecimal(1));
+            BigDecimal totalAllowance = BigDecimal.ZERO;
+            BigDecimal totalCharge = BigDecimal.ZERO;
+            
+            for(IZUGFeRDAllowanceCharge itemAllowance : currentItem.getItemAllowances()){
+                totalAllowance = itemAllowance.getAmount().add(totalAllowance);
+            }
+            
+            for(IZUGFeRDAllowanceCharge itemCharge : currentItem.getItemCharges()){
+                totalCharge = itemCharge.getAmount().add(totalAllowance);
+            }
+            
+            BigDecimal multiplicator = currentItem.getProduct().getVATPercent().divide(new BigDecimal(100)).add(BigDecimal.ONE);
 //			priceGross=currentItem.getPrice().multiply(multiplicator);
-            totalGross = currentItem.getPrice().multiply(multiplicator).multiply(currentItem.getQuantity());
-            itemTotalNetAmount = currentItem.getQuantity().multiply(currentItem.getPrice()).setScale(2, BigDecimal.ROUND_HALF_UP);
+            
+            totalGross = currentItem.getPrice().multiply(currentItem.getQuantity()).subtract(totalAllowance).add(totalCharge).multiply(multiplicator);
+            itemTotalNetAmount = currentItem.getPrice().multiply(currentItem.getQuantity()).subtract(totalAllowance).add(totalCharge).setScale(2, BigDecimal.ROUND_HALF_UP);
             itemTotalVATAmount = totalGross.subtract(itemTotalNetAmount);
         }
 
@@ -814,6 +826,34 @@ public class ZUGFeRDExporter {
             grossChargeAmount.setValue(priceFormat(currentItem.getPrice()));
             grossTradePrice.getChargeAmount().add(grossChargeAmount);
             tradeAgreement.getGrossPriceProductTradePrice().add(grossTradePrice);
+            
+            if(currentItem.getItemAllowances() != null){
+                for(IZUGFeRDAllowanceCharge itemAllowance : currentItem.getItemAllowances()){
+                    TradeAllowanceChargeType eItemAllowance = xmlFactory.createTradeAllowanceChargeType();
+                    AmountType actualAmount = xmlFactory.createAmountType();
+                    actualAmount.setCurrencyID(trans.getInvoiceCurrency());
+                    actualAmount.setValue(itemAllowance.getAmount());
+                    eItemAllowance.getActualAmount().add(actualAmount);
+                    TextType reason = xmlFactory.createTextType();
+                    reason.setValue(itemAllowance.getReason());
+                    eItemAllowance.setReason(reason);
+                    grossTradePrice.getAppliedTradeAllowanceCharge().add(eItemAllowance);
+                }         
+            }
+            
+            if(currentItem.getItemCharges() != null){
+                for(IZUGFeRDAllowanceCharge itemCharge : currentItem.getItemCharges()){
+                    TradeAllowanceChargeType eItemCharge = xmlFactory.createTradeAllowanceChargeType();
+                    AmountType actualAmount = xmlFactory.createAmountType();
+                    actualAmount.setCurrencyID(trans.getInvoiceCurrency());
+                    actualAmount.setValue(itemCharge.getAmount());
+                    eItemCharge.getActualAmount().add(actualAmount);
+                    TextType reason = xmlFactory.createTextType();
+                    reason.setValue(itemCharge.getReason());
+                    eItemCharge.setReason(reason);
+                    grossTradePrice.getAppliedTradeAllowanceCharge().add(eItemCharge);
+                }               
+            }
 
             TradePriceType netTradePrice = xmlFactory.createTradePriceType();
             QuantityType netQuantity = xmlFactory.createQuantityType();

From c49e1c73957a15559c585c4803e12cbb95e3c441 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Tue, 17 Nov 2015 16:56:10 +0100
Subject: [PATCH 13/15] implementation of item charges and allowance

---
 .../ZUGFeRD/IZUGFeRDAllowanceCharge.java      |  2 +-
 .../ZUGFeRD/ZUGFeRDExporter.java              | 48 ++++++++++++-------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDAllowanceCharge.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDAllowanceCharge.java
index 040cda54..9691ecff 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDAllowanceCharge.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDAllowanceCharge.java
@@ -22,7 +22,7 @@ import java.math.BigDecimal;
  * @author AlexanderSchmidt
  */
 public interface IZUGFeRDAllowanceCharge {
-    BigDecimal getAmount();
+    BigDecimal getTotalAmount();
     
     String getReason();
     
diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index 58083d2c..3fb0b4f8 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -81,6 +81,7 @@ public class ZUGFeRDExporter {
         private BigDecimal totalGross;
         private BigDecimal itemTotalNetAmount;
         private BigDecimal itemTotalVATAmount;
+        private BigDecimal itemNetAmount;
 
         public LineCalc(IZUGFeRDExportableItem currentItem) {
             this.currentItem = currentItem;
@@ -88,19 +89,20 @@ public class ZUGFeRDExporter {
             BigDecimal totalCharge = BigDecimal.ZERO;
             
             for(IZUGFeRDAllowanceCharge itemAllowance : currentItem.getItemAllowances()){
-                totalAllowance = itemAllowance.getAmount().add(totalAllowance);
+                totalAllowance = itemAllowance.getTotalAmount().add(totalAllowance);
             }
             
             for(IZUGFeRDAllowanceCharge itemCharge : currentItem.getItemCharges()){
-                totalCharge = itemCharge.getAmount().add(totalAllowance);
+                totalCharge = itemCharge.getTotalAmount().add(totalCharge);
             }
             
-            BigDecimal multiplicator = currentItem.getProduct().getVATPercent().divide(new BigDecimal(100)).add(BigDecimal.ONE);
+            BigDecimal multiplicator = currentItem.getProduct().getVATPercent().divide(new BigDecimal(100), 4, BigDecimal.ROUND_HALF_UP).add(BigDecimal.ONE);
 //			priceGross=currentItem.getPrice().multiply(multiplicator);
             
             totalGross = currentItem.getPrice().multiply(currentItem.getQuantity()).subtract(totalAllowance).add(totalCharge).multiply(multiplicator);
             itemTotalNetAmount = currentItem.getPrice().multiply(currentItem.getQuantity()).subtract(totalAllowance).add(totalCharge).setScale(2, BigDecimal.ROUND_HALF_UP);
             itemTotalVATAmount = totalGross.subtract(itemTotalNetAmount);
+            itemNetAmount = currentItem.getPrice().multiply(currentItem.getQuantity()).subtract(totalAllowance).add(totalCharge).divide(currentItem.getQuantity(), 4, BigDecimal.ROUND_HALF_UP);
         }
 
         public BigDecimal getItemTotalNetAmount() {
@@ -110,6 +112,10 @@ public class ZUGFeRDExporter {
         public BigDecimal getItemTotalVATAmount() {
             return itemTotalVATAmount;
         }
+        
+        public BigDecimal getItemNetAmount(){
+            return itemNetAmount;
+        }
 
     }
 
@@ -580,7 +586,7 @@ public class ZUGFeRDExporter {
             
             AmountType actualAmount = xmlFactory.createAmountType();
             actualAmount.setCurrencyID(trans.getInvoiceCurrency());       
-            actualAmount.setValue(currencyFormat(iAllowance.getAmount()));
+            actualAmount.setValue(currencyFormat(iAllowance.getTotalAmount()));
             allowance.getActualAmount().add(actualAmount);
             
             TextType reason = xmlFactory.createTextType();
@@ -628,7 +634,7 @@ public class ZUGFeRDExporter {
             
             AmountType actualAmount = xmlFactory.createAmountType();
             actualAmount.setCurrencyID(trans.getInvoiceCurrency());       
-            actualAmount.setValue(currencyFormat(iCharge.getAmount()));
+            actualAmount.setValue(currencyFormat(iCharge.getTotalAmount()));
             charge.getActualAmount().add(actualAmount);
             
             TextType reason = xmlFactory.createTextType();
@@ -672,7 +678,7 @@ public class ZUGFeRDExporter {
 
             AmountType actualAmount = xmlFactory.createAmountType();
             actualAmount.setCurrencyID(trans.getInvoiceCurrency());       
-            actualAmount.setValue(currencyFormat(iServiceCharge.getAmount()));
+            actualAmount.setValue(currencyFormat(iServiceCharge.getTotalAmount()));
             serviceCharge.getAppliedAmount().add(actualAmount);
             
             TextType reason = xmlFactory.createTextType();
@@ -739,7 +745,7 @@ public class ZUGFeRDExporter {
         if(trans.getZFAllowances() != null){
             BigDecimal totalHeaderAllowance = BigDecimal.ZERO;
             for(IZUGFeRDAllowanceCharge headerAllowance : trans.getZFAllowances()){
-                totalHeaderAllowance = headerAllowance.getAmount().add(totalHeaderAllowance);
+                totalHeaderAllowance = headerAllowance.getTotalAmount().add(totalHeaderAllowance);
             }
             allowanceTotalAmount.setValue(currencyFormat(totalHeaderAllowance));
         }else{
@@ -753,12 +759,12 @@ public class ZUGFeRDExporter {
         totalChargeAmount.setCurrencyID(trans.getInvoiceCurrency());
         if(trans.getZFLogisticsServiceCharges()!= null){
             for(IZUGFeRDAllowanceCharge logisticsServiceCharge : trans.getZFLogisticsServiceCharges()){
-                totalCharge = logisticsServiceCharge.getAmount().add(totalCharge);
+                totalCharge = logisticsServiceCharge.getTotalAmount().add(totalCharge);
             }          
         }
         if(trans.getZFCharges()!= null){
             for(IZUGFeRDAllowanceCharge charge : trans.getZFCharges()){
-                totalCharge = charge.getAmount().add(totalCharge);
+                totalCharge = charge.getTotalAmount().add(totalCharge);
             }
         }
                 
@@ -832,11 +838,14 @@ public class ZUGFeRDExporter {
                     TradeAllowanceChargeType eItemAllowance = xmlFactory.createTradeAllowanceChargeType();
                     AmountType actualAmount = xmlFactory.createAmountType();
                     actualAmount.setCurrencyID(trans.getInvoiceCurrency());
-                    actualAmount.setValue(itemAllowance.getAmount());
+                    actualAmount.setValue(priceFormat(itemAllowance.getTotalAmount().divide(currentItem.getQuantity(), 4, BigDecimal.ROUND_HALF_UP)));
                     eItemAllowance.getActualAmount().add(actualAmount);
                     TextType reason = xmlFactory.createTextType();
                     reason.setValue(itemAllowance.getReason());
                     eItemAllowance.setReason(reason);
+                    IndicatorType chargeIndicator = xmlFactory.createIndicatorType();
+                    chargeIndicator.setIndicator(false);
+                    eItemAllowance.setChargeIndicator(chargeIndicator);
                     grossTradePrice.getAppliedTradeAllowanceCharge().add(eItemAllowance);
                 }         
             }
@@ -846,11 +855,14 @@ public class ZUGFeRDExporter {
                     TradeAllowanceChargeType eItemCharge = xmlFactory.createTradeAllowanceChargeType();
                     AmountType actualAmount = xmlFactory.createAmountType();
                     actualAmount.setCurrencyID(trans.getInvoiceCurrency());
-                    actualAmount.setValue(itemCharge.getAmount());
+                    actualAmount.setValue(priceFormat(itemCharge.getTotalAmount().divide(currentItem.getQuantity(), 4, BigDecimal.ROUND_HALF_UP)));
                     eItemCharge.getActualAmount().add(actualAmount);
                     TextType reason = xmlFactory.createTextType();
                     reason.setValue(itemCharge.getReason());
                     eItemCharge.setReason(reason);
+                    IndicatorType chargeIndicator = xmlFactory.createIndicatorType();
+                    chargeIndicator.setIndicator(true);
+                    eItemCharge.setChargeIndicator(chargeIndicator);
                     grossTradePrice.getAppliedTradeAllowanceCharge().add(eItemCharge);
                 }               
             }
@@ -863,7 +875,7 @@ public class ZUGFeRDExporter {
 
             AmountType netChargeAmount = xmlFactory.createAmountType();
             netChargeAmount.setCurrencyID(trans.getInvoiceCurrency());
-            netChargeAmount.setValue(priceFormat(currentItem.getPrice()));
+            netChargeAmount.setValue(priceFormat(lc.getItemNetAmount()));
             netTradePrice.getChargeAmount().add(netChargeAmount);
             tradeAgreement.getNetPriceProductTradePrice().add(netTradePrice);
 
@@ -949,19 +961,19 @@ public class ZUGFeRDExporter {
         
         if(trans.getZFAllowances() != null){
             for (IZUGFeRDAllowanceCharge headerAllowance : trans.getZFAllowances()){
-                res = res.subtract(headerAllowance.getAmount());
+                res = res.subtract(headerAllowance.getTotalAmount());
             }
         }
         
         if(trans.getZFLogisticsServiceCharges()!= null){
             for (IZUGFeRDAllowanceCharge logisticsServiceCharge : trans.getZFLogisticsServiceCharges()){
-                res = res.add(logisticsServiceCharge.getAmount());
+                res = res.add(logisticsServiceCharge.getTotalAmount());
             }
         }
         
         if(trans.getZFCharges()!= null){
             for (IZUGFeRDAllowanceCharge charge : trans.getZFCharges()){
-                res = res.add(charge.getAmount());
+                res = res.add(charge.getTotalAmount());
             }
         }        
               
@@ -1001,7 +1013,7 @@ public class ZUGFeRDExporter {
         if(trans.getZFAllowances() != null){
             for (IZUGFeRDAllowanceCharge headerAllowance : trans.getZFAllowances()){
                 BigDecimal percent = headerAllowance.getTaxPercent();
-                VATAmount itemVATAmount = new VATAmount(headerAllowance.getAmount(), headerAllowance.getAmount().multiply(percent).divide(new BigDecimal(100)));
+                VATAmount itemVATAmount = new VATAmount(headerAllowance.getTotalAmount(), headerAllowance.getTotalAmount().multiply(percent).divide(new BigDecimal(100)));
                 VATAmount current = hm.get(percent);
                 if (current == null) {
                     hm.put(percent, itemVATAmount);
@@ -1014,7 +1026,7 @@ public class ZUGFeRDExporter {
         if(trans.getZFLogisticsServiceCharges()!= null){
             for (IZUGFeRDAllowanceCharge logisticsServiceCharge : trans.getZFLogisticsServiceCharges()){
                 BigDecimal percent = logisticsServiceCharge.getTaxPercent();
-                VATAmount itemVATAmount = new VATAmount(logisticsServiceCharge.getAmount(), logisticsServiceCharge.getAmount().multiply(percent).divide(new BigDecimal(100)));
+                VATAmount itemVATAmount = new VATAmount(logisticsServiceCharge.getTotalAmount(), logisticsServiceCharge.getTotalAmount().multiply(percent).divide(new BigDecimal(100)));
                 VATAmount current = hm.get(percent);
                 if (current == null) {
                     hm.put(percent, itemVATAmount);
@@ -1027,7 +1039,7 @@ public class ZUGFeRDExporter {
         if(trans.getZFCharges()!= null){
             for (IZUGFeRDAllowanceCharge charge : trans.getZFCharges()){
                 BigDecimal percent = charge.getTaxPercent();
-                VATAmount itemVATAmount = new VATAmount(charge.getAmount(), charge.getAmount().multiply(percent).divide(new BigDecimal(100)));
+                VATAmount itemVATAmount = new VATAmount(charge.getTotalAmount(), charge.getTotalAmount().multiply(percent).divide(new BigDecimal(100)));
                 VATAmount current = hm.get(percent);
                 if (current == null) {
                     hm.put(percent, itemVATAmount);

From 82f9abb26c9d5abe32d64923991d804537a94fc8 Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Fri, 20 Nov 2015 11:24:18 +0100
Subject: [PATCH 14/15] improved calculation of totals

---
 .../ZUGFeRD/ZUGFeRDExporter.java              | 140 ++++++++++--------
 1 file changed, 80 insertions(+), 60 deletions(-)

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index 3fb0b4f8..350e2edf 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -66,6 +66,7 @@ public class ZUGFeRDExporter {
      * doc.save(PDFfilename);
      *
      * @author jstaerk
+     * @throws javax.xml.bind.JAXBException
      *
      */
     public ZUGFeRDExporter() throws JAXBException {
@@ -77,14 +78,12 @@ public class ZUGFeRDExporter {
 
     private class LineCalc {
 
-        private IZUGFeRDExportableItem currentItem = null;
         private BigDecimal totalGross;
         private BigDecimal itemTotalNetAmount;
         private BigDecimal itemTotalVATAmount;
         private BigDecimal itemNetAmount;
 
         public LineCalc(IZUGFeRDExportableItem currentItem) {
-            this.currentItem = currentItem;
             BigDecimal totalAllowance = BigDecimal.ZERO;
             BigDecimal totalCharge = BigDecimal.ZERO;
             
@@ -117,6 +116,73 @@ public class ZUGFeRDExporter {
             return itemNetAmount;
         }
 
+    }
+    
+    private class Totals{
+        private BigDecimal totalNetAmount;
+        private BigDecimal totalGrossAmount;
+        private BigDecimal lineTotalAmount;
+        private BigDecimal totalTaxAmount;
+                
+        public Totals(){
+            BigDecimal res = BigDecimal.ZERO;        
+            for (IZUGFeRDExportableItem currentItem : trans.getZFItems()) {
+                LineCalc lc = new LineCalc(currentItem);
+                res = res.add(lc.getItemTotalNetAmount());
+            }
+            // Set line total
+            this.lineTotalAmount = res;
+
+            if(trans.getZFAllowances() != null){
+                for (IZUGFeRDAllowanceCharge headerAllowance : trans.getZFAllowances()){
+                    res = res.subtract(headerAllowance.getTotalAmount());
+                }
+            }
+
+            if(trans.getZFLogisticsServiceCharges()!= null){
+                for (IZUGFeRDAllowanceCharge logisticsServiceCharge : trans.getZFLogisticsServiceCharges()){
+                    res = res.add(logisticsServiceCharge.getTotalAmount());
+                }
+            }
+
+            if(trans.getZFCharges()!= null){
+                for (IZUGFeRDAllowanceCharge charge : trans.getZFCharges()){
+                    res = res.add(charge.getTotalAmount());
+                }
+            }
+            
+            // Set total net amount
+            this.totalNetAmount = res;
+
+            HashMap<BigDecimal, VATAmount> VATPercentAmountMap = getVATPercentAmountMap();
+            for (BigDecimal currentTaxPercent : VATPercentAmountMap.keySet()) {
+                VATAmount amount = VATPercentAmountMap.get(currentTaxPercent);
+                res = res.add(amount.getCalculated());
+            }
+            
+            // Set total gross amount
+            this.totalGrossAmount = res;
+            
+            this.totalTaxAmount = this.totalGrossAmount.subtract(this.totalNetAmount);
+        }
+        
+        public BigDecimal getTotalNet(){
+           return totalNetAmount; 
+        }
+        
+        public BigDecimal getTotalGross(){
+            return totalGrossAmount;
+        }
+        
+        public BigDecimal getLineTotal(){
+            return lineTotalAmount;
+        }
+        
+        public BigDecimal getTaxTotal(){
+            return totalTaxAmount;
+        }
+        
+        
     }
 
     //// MAIN CLASS
@@ -291,9 +357,13 @@ public class ZUGFeRDExporter {
     private final Marshaller marshaller;
     private static final SimpleDateFormat germanDateFormat = new SimpleDateFormat("dd.MM.yyyy"); //$NON-NLS-1$
     private static final SimpleDateFormat zugferdDateFormat = new SimpleDateFormat("yyyyMMdd"); //$NON-NLS-1$
+    
+    private Totals totals;
 
     private String getZugferdXMLForTransaction(IZUGFeRDExportableTransaction trans) throws JAXBException {
         this.trans = trans;
+        
+        this.totals = new Totals();
 
         CrossIndustryDocumentType invoice = xmlFactory.createCrossIndustryDocumentType();
 
@@ -779,27 +849,27 @@ public class ZUGFeRDExporter {
 
         AmountType lineTotalAmount = xmlFactory.createAmountType();
         lineTotalAmount.setCurrencyID(trans.getInvoiceCurrency());
-        lineTotalAmount.setValue(currencyFormat(this.getLineTotal()));
+        lineTotalAmount.setValue(currencyFormat(totals.getLineTotal()));
         monetarySummation.getLineTotalAmount().add(lineTotalAmount);
 
         AmountType taxBasisTotalAmount = xmlFactory.createAmountType();
         taxBasisTotalAmount.setCurrencyID(trans.getInvoiceCurrency());
-        taxBasisTotalAmount.setValue(currencyFormat(this.getTotal()));
+        taxBasisTotalAmount.setValue(currencyFormat(totals.getTotalNet()));
         monetarySummation.getTaxBasisTotalAmount().add(taxBasisTotalAmount);
 
         AmountType taxTotalAmount = xmlFactory.createAmountType();
         taxTotalAmount.setCurrencyID(trans.getInvoiceCurrency());
-        taxTotalAmount.setValue(currencyFormat(this.getTotalGross().subtract(this.getTotal())));
+        taxTotalAmount.setValue(currencyFormat(totals.getTaxTotal()));
         monetarySummation.getTaxTotalAmount().add(taxTotalAmount);
 
         AmountType grandTotalAmount = xmlFactory.createAmountType();
         grandTotalAmount.setCurrencyID(trans.getInvoiceCurrency());
-        grandTotalAmount.setValue(currencyFormat(this.getTotalGross()));
+        grandTotalAmount.setValue(currencyFormat(totals.getTotalGross()));
         monetarySummation.getGrandTotalAmount().add(grandTotalAmount);
 
         AmountType duePayableAmount = xmlFactory.createAmountType();
         duePayableAmount.setCurrencyID(trans.getInvoiceCurrency());
-        duePayableAmount.setValue(currencyFormat(this.getTotalGross()));
+        duePayableAmount.setValue(currencyFormat(totals.getTotalGross()));
         monetarySummation.getDuePayableAmount().add(duePayableAmount);
 
         return monetarySummation;
@@ -836,6 +906,9 @@ public class ZUGFeRDExporter {
             if(currentItem.getItemAllowances() != null){
                 for(IZUGFeRDAllowanceCharge itemAllowance : currentItem.getItemAllowances()){
                     TradeAllowanceChargeType eItemAllowance = xmlFactory.createTradeAllowanceChargeType();
+                    IndicatorType chargeIndicator = xmlFactory.createIndicatorType();
+                    chargeIndicator.setIndicator(false);
+                    eItemAllowance.setChargeIndicator(chargeIndicator);                    
                     AmountType actualAmount = xmlFactory.createAmountType();
                     actualAmount.setCurrencyID(trans.getInvoiceCurrency());
                     actualAmount.setValue(priceFormat(itemAllowance.getTotalAmount().divide(currentItem.getQuantity(), 4, BigDecimal.ROUND_HALF_UP)));
@@ -843,9 +916,6 @@ public class ZUGFeRDExporter {
                     TextType reason = xmlFactory.createTextType();
                     reason.setValue(itemAllowance.getReason());
                     eItemAllowance.setReason(reason);
-                    IndicatorType chargeIndicator = xmlFactory.createIndicatorType();
-                    chargeIndicator.setIndicator(false);
-                    eItemAllowance.setChargeIndicator(chargeIndicator);
                     grossTradePrice.getAppliedTradeAllowanceCharge().add(eItemAllowance);
                 }         
             }
@@ -930,56 +1000,6 @@ public class ZUGFeRDExporter {
 
     }
 
-    private BigDecimal getTotalGross() {
-
-        BigDecimal res = getTotal();
-        HashMap<BigDecimal, VATAmount> VATPercentAmountMap = getVATPercentAmountMap();
-        for (BigDecimal currentTaxPercent : VATPercentAmountMap.keySet()) {
-            VATAmount amount = VATPercentAmountMap.get(currentTaxPercent);
-            res = res.add(amount.getCalculated());
-        }
-
-        return res;
-    }
-
-    private BigDecimal getLineTotal() {
-        BigDecimal res = BigDecimal.ZERO;        
-        for (IZUGFeRDExportableItem currentItem : trans.getZFItems()) {
-            LineCalc lc = new LineCalc(currentItem);
-            res = res.add(lc.getItemTotalNetAmount());
-        }
-        
-        return res;
-    }
-    
-    private BigDecimal getTotal() {
-        BigDecimal res = BigDecimal.ZERO;        
-        for (IZUGFeRDExportableItem currentItem : trans.getZFItems()) {
-            LineCalc lc = new LineCalc(currentItem);
-            res = res.add(lc.getItemTotalNetAmount());
-        }
-        
-        if(trans.getZFAllowances() != null){
-            for (IZUGFeRDAllowanceCharge headerAllowance : trans.getZFAllowances()){
-                res = res.subtract(headerAllowance.getTotalAmount());
-            }
-        }
-        
-        if(trans.getZFLogisticsServiceCharges()!= null){
-            for (IZUGFeRDAllowanceCharge logisticsServiceCharge : trans.getZFLogisticsServiceCharges()){
-                res = res.add(logisticsServiceCharge.getTotalAmount());
-            }
-        }
-        
-        if(trans.getZFCharges()!= null){
-            for (IZUGFeRDAllowanceCharge charge : trans.getZFCharges()){
-                res = res.add(charge.getTotalAmount());
-            }
-        }        
-              
-        return res;
-    }
-
     /**
      * which taxes have been used with which amounts in this transaction, empty
      * for no taxes, or e.g. 19=>190 and 7=>14 if 1000 Eur were applicable to

From 08bae5f01ba87a0811d94b9c17c07080c778bc5b Mon Sep 17 00:00:00 2001
From: AlexanderSchmidt <AlexanderSchmidt@Alex-PC>
Date: Fri, 20 Nov 2015 11:40:04 +0100
Subject: [PATCH 15/15] fix item calc in case allowance and charges are null

---
 .../org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index 350e2edf..d200b757 100644
--- a/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -87,12 +87,16 @@ public class ZUGFeRDExporter {
             BigDecimal totalAllowance = BigDecimal.ZERO;
             BigDecimal totalCharge = BigDecimal.ZERO;
             
-            for(IZUGFeRDAllowanceCharge itemAllowance : currentItem.getItemAllowances()){
-                totalAllowance = itemAllowance.getTotalAmount().add(totalAllowance);
+            if(currentItem.getItemAllowances() != null){
+                for(IZUGFeRDAllowanceCharge itemAllowance : currentItem.getItemAllowances()){
+                    totalAllowance = itemAllowance.getTotalAmount().add(totalAllowance);
+                }
             }
             
-            for(IZUGFeRDAllowanceCharge itemCharge : currentItem.getItemCharges()){
-                totalCharge = itemCharge.getTotalAmount().add(totalCharge);
+            if(currentItem.getItemCharges() != null){
+                for(IZUGFeRDAllowanceCharge itemCharge : currentItem.getItemCharges()){
+                    totalCharge = itemCharge.getTotalAmount().add(totalCharge);
+                }
             }
             
             BigDecimal multiplicator = currentItem.getProduct().getVATPercent().divide(new BigDecimal(100), 4, BigDecimal.ROUND_HALF_UP).add(BigDecimal.ONE);