Index: APPS/EDIExport/FactuurVerzender/Kvik/XML/Totals.cls.xml
===================================================================
diff -u -r32377 -r33444
--- APPS/EDIExport/FactuurVerzender/Kvik/XML/Totals.cls.xml	(.../Totals.cls.xml)	(revision 32377)
+++ APPS/EDIExport/FactuurVerzender/Kvik/XML/Totals.cls.xml	(.../Totals.cls.xml)	(revision 33444)
@@ -56,6 +56,28 @@
 <Required>1</Required>
 <Parameter name="XMLNAME" value="TotalLineAmount"/>
 </Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>TotalsState</State>
+<StreamLocation>^APPS.EDIExport.Fact604A.TotalsS</StreamLocation>
+<Data name="TotalsState">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>TotalAmount</Value>
+</Value>
+<Value name="2">
+<Value>TotalTaxAmount</Value>
+</Value>
+<Value name="3">
+<Value>TotalTaxableAmount</Value>
+</Value>
+<Value name="4">
+<Value>TotalLineAmount</Value>
+</Value>
+</Data>
+</Storage>
 </Class>
 
 
Index: vhTestFiles/UnitTests/APPS.EDIExport.FactuurVerzender.impl.Kvik.Verzender.Verzend/Test/TestKvikfactuurconverteerder/KvikFactuurTestOuput.xml
===================================================================
diff -u -r33441 -r33444
--- vhTestFiles/UnitTests/APPS.EDIExport.FactuurVerzender.impl.Kvik.Verzender.Verzend/Test/TestKvikfactuurconverteerder/KvikFactuurTestOuput.xml	(.../KvikFactuurTestOuput.xml)	(revision 33441)
+++ vhTestFiles/UnitTests/APPS.EDIExport.FactuurVerzender.impl.Kvik.Verzender.Verzend/Test/TestKvikfactuurconverteerder/KvikFactuurTestOuput.xml	(.../KvikFactuurTestOuput.xml)	(revision 33444)
@@ -56,10 +56,15 @@
     </Payment>
     <CurrencyCode>EUR</CurrencyCode>
     <Amounts>
+      <TaxGroups>
+        <Percent>0.00</Percent>
+        <TaxableAmount>16.56</TaxableAmount>
+        <TaxAmount>0.00</TaxAmount>
+      </TaxGroups>
       <Totals>
         <TotalAmount>16.56</TotalAmount>
         <TotalTaxAmount>0.00</TotalTaxAmount>
-        <TotalTaxableAmount>0.00</TotalTaxableAmount>
+        <TotalTaxableAmount>16.56</TotalTaxableAmount>
         <TotalLineAmount>16.56</TotalLineAmount>
       </Totals>
     </Amounts>
Index: APPS/EDIExport/FactuurVerzender/impl/Kvik/Converteerder.cls.xml
===================================================================
diff -u -r33443 -r33444
--- APPS/EDIExport/FactuurVerzender/impl/Kvik/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 33443)
+++ APPS/EDIExport/FactuurVerzender/impl/Kvik/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 33444)
@@ -31,6 +31,7 @@
 	Do ..ZetLeverAdres()
 	Do ..ZetKlant()
 	Do ..ZetBetaling()
+	Do ..ZetBTWGroepen()
 	Do ..ZetTotalen()
 
 	Set ..Document.Header.References.SupplierOrderNumber = ..GeefOrderVerwijzing().GeefOrderNr()
@@ -85,12 +86,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetBTWGroepen">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..Document.Header.Amounts.TaxGroups.Percent = $fnumber(..KvikFactuur.GeefBTWPercentage(),"",2)
+	Set ..Document.Header.Amounts.TaxGroups.TaxableAmount = $fnumber(..KvikFactuur.GeefTotaalBelastbaar(),"",2)
+	Set ..Document.Header.Amounts.TaxGroups.TaxAmount = $fnumber(..KvikFactuur.GeefTotaalBTW(),"",2)
+]]></Implementation>
+</Method>
+
 <Method name="ZetTotalen">
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set ..Document.Header.Amounts.Totals.TotalAmount = $fnumber(..KvikFactuur.GeefTotaalTeBetalen(),"",2)
-	Set ..Document.Header.Amounts.Totals.TotalTaxableAmount = "0.00"
-	Set ..Document.Header.Amounts.Totals.TotalTaxAmount = "0.00"
+	Set ..Document.Header.Amounts.Totals.TotalTaxableAmount = $fnumber(..KvikFactuur.GeefTotaalBelastbaar(),"",2)
+	Set ..Document.Header.Amounts.Totals.TotalTaxAmount = $fnumber(..KvikFactuur.GeefTotaalBTW(),"",2)
 	Set ..Document.Header.Amounts.Totals.TotalLineAmount = $fnumber(..KvikFactuur.GeefTotaalGoederen(),"",2)
 ]]></Implementation>
 </Method>
Index: APPS/EDIExport/FactuurVerzender/Kvik/XML/TotalAmounts.cls.xml
===================================================================
diff -u -r32377 -r33444
--- APPS/EDIExport/FactuurVerzender/Kvik/XML/TotalAmounts.cls.xml	(.../TotalAmounts.cls.xml)	(revision 32377)
+++ APPS/EDIExport/FactuurVerzender/Kvik/XML/TotalAmounts.cls.xml	(.../TotalAmounts.cls.xml)	(revision 33444)
@@ -25,13 +25,36 @@
 <Default>1</Default>
 </Parameter>
 
+<Property name="TaxGroups">
+<Description>
+Information about total Tax groups and amounts.
+Tax group.</Description>
+<Type>APPS.EDIExport.FactuurVerzender.Kvik.XML.Tax</Type>
+<Required>1</Required>
+<Parameter name="XMLNAME" value="TaxGroups"/>
+</Property>
+
 <Property name="Totals">
 <Description>
 Total Amounts for the Invoice.</Description>
 <Type>APPS.EDIExport.FactuurVerzender.Kvik.XML.Totals</Type>
 <Required>1</Required>
 <Parameter name="XMLNAME" value="Totals"/>
 </Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>TotalAmountsState</State>
+<StreamLocation>^APPS.EDIExpor604A.TotalAmountsS</StreamLocation>
+<Data name="TotalAmountsState">
+<Value name="1">
+<Value>Totals</Value>
+</Value>
+<Value name="2">
+<Value>TaxGroups</Value>
+</Value>
+</Data>
+</Storage>
 </Class>
 
 
Index: APPS/EDIExport/FactuurVerzender/Kvik/XML/Tax.cls.xml
===================================================================
diff -u
--- APPS/EDIExport/FactuurVerzender/Kvik/XML/Tax.cls.xml	(revision 0)
+++ APPS/EDIExport/FactuurVerzender/Kvik/XML/Tax.cls.xml	(revision 33444)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDIExport.FactuurVerzender.Kvik.XML.Tax">
+<Description>
+Created from: e:/kvik/kvik_custom_invoice_xml.xsd</Description>
+<ClassType>serial</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SerialObject,%XML.Adaptor</Super>
+<Inheritance>right</Inheritance>
+
+<Parameter name="XMLNAME">
+<Default>Tax</Default>
+</Parameter>
+
+<Parameter name="XMLSEQUENCE">
+<Default>1</Default>
+</Parameter>
+
+<Property name="Percent">
+<Description>
+The Tax Percent (rate).</Description>
+<Type>%Numeric</Type>
+<Required>1</Required>
+<Parameter name="XMLNAME" value="Percent"/>
+</Property>
+
+<Property name="TaxableAmount">
+<Description>
+The net amount to which the Tax Percent is applied to calculate the Tax Amount.</Description>
+<Type>%Numeric</Type>
+<Required>1</Required>
+<Parameter name="XMLNAME" value="TaxableAmount"/>
+</Property>
+
+<Property name="TaxAmount">
+<Description>
+The calculated Tax amount.</Description>
+<Type>%Numeric</Type>
+<Required>1</Required>
+<Parameter name="XMLNAME" value="TaxAmount"/>
+</Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>TaxState</State>
+<StreamLocation>^APPS.EDIExport.Factuur604A.TaxS</StreamLocation>
+<Data name="TaxState">
+<Value name="1">
+<Value>Percent</Value>
+</Value>
+<Value name="2">
+<Value>TaxableAmount</Value>
+</Value>
+<Value name="3">
+<Value>TaxAmount</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>