Index: vhTestFiles/UnitTests/APPS.EDIExport.FactuurVerzender.impl.Kvik.Verzender.Verzend/Test/TestKvikfactuurconverteerdermetBTW/KvikFactuurMetBTWTestOuput.xml
===================================================================
diff -u -r33448 -r33466
--- vhTestFiles/UnitTests/APPS.EDIExport.FactuurVerzender.impl.Kvik.Verzender.Verzend/Test/TestKvikfactuurconverteerdermetBTW/KvikFactuurMetBTWTestOuput.xml	(.../KvikFactuurMetBTWTestOuput.xml)	(revision 33448)
+++ vhTestFiles/UnitTests/APPS.EDIExport.FactuurVerzender.impl.Kvik.Verzender.Verzend/Test/TestKvikfactuurconverteerdermetBTW/KvikFactuurMetBTWTestOuput.xml	(.../KvikFactuurMetBTWTestOuput.xml)	(revision 33466)
@@ -57,9 +57,11 @@
     <CurrencyCode>EUR</CurrencyCode>
     <Amounts>
       <TaxGroups>
-        <Percent>21.00</Percent>
-        <TaxableAmount>239.17</TaxableAmount>
-        <TaxAmount>50.23</TaxAmount>
+        <Tax>
+          <Percent>21.00</Percent>
+          <TaxableAmount>239.17</TaxableAmount>
+          <TaxAmount>50.23</TaxAmount>
+        </Tax>
       </TaxGroups>
       <Totals>
         <TotalAmount>289.40</TotalAmount>
Index: vhTestFiles/UnitTests/APPS.EDIExport.FactuurVerzender.impl.Kvik.Verzender.Verzend/Test/TestKvikfactuurconverteerder/KvikFactuurTestOuput.xml
===================================================================
diff -u -r33444 -r33466
--- vhTestFiles/UnitTests/APPS.EDIExport.FactuurVerzender.impl.Kvik.Verzender.Verzend/Test/TestKvikfactuurconverteerder/KvikFactuurTestOuput.xml	(.../KvikFactuurTestOuput.xml)	(revision 33444)
+++ vhTestFiles/UnitTests/APPS.EDIExport.FactuurVerzender.impl.Kvik.Verzender.Verzend/Test/TestKvikfactuurconverteerder/KvikFactuurTestOuput.xml	(.../KvikFactuurTestOuput.xml)	(revision 33466)
@@ -57,9 +57,11 @@
     <CurrencyCode>EUR</CurrencyCode>
     <Amounts>
       <TaxGroups>
-        <Percent>0.00</Percent>
-        <TaxableAmount>16.56</TaxableAmount>
-        <TaxAmount>0.00</TaxAmount>
+        <Tax>
+          <Percent>0.00</Percent>
+          <TaxableAmount>16.56</TaxableAmount>
+          <TaxAmount>0.00</TaxAmount>
+        </Tax>
       </TaxGroups>
       <Totals>
         <TotalAmount>16.56</TotalAmount>
Index: APPS/EDIExport/FactuurVerzender/Kvik/XML/TotalAmounts.cls.xml
===================================================================
diff -u -r33444 -r33466
--- APPS/EDIExport/FactuurVerzender/Kvik/XML/TotalAmounts.cls.xml	(.../TotalAmounts.cls.xml)	(revision 33444)
+++ APPS/EDIExport/FactuurVerzender/Kvik/XML/TotalAmounts.cls.xml	(.../TotalAmounts.cls.xml)	(revision 33466)
@@ -29,7 +29,7 @@
 <Description>
 Information about total Tax groups and amounts.
 Tax group.</Description>
-<Type>APPS.EDIExport.FactuurVerzender.Kvik.XML.Tax</Type>
+<Type>APPS.EDIExport.FactuurVerzender.Kvik.XML.TaxGroups</Type>
 <Required>1</Required>
 <Parameter name="XMLNAME" value="TaxGroups"/>
 </Property>
Index: APPS/EDIExport/FactuurVerzender/impl/Kvik/Converteerder.cls.xml
===================================================================
diff -u -r33445 -r33466
--- APPS/EDIExport/FactuurVerzender/impl/Kvik/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 33445)
+++ APPS/EDIExport/FactuurVerzender/impl/Kvik/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 33466)
@@ -88,9 +88,9 @@
 <Method name="ZetBTWGroepen">
 <Private>1</Private>
 <Implementation><![CDATA[
-	Set ..Document.Header.Amounts.TaxGroups.Percent = $fnumber((..KvikFactuur.GeefBTWPercentage() * 100),"",2)
-	Set ..Document.Header.Amounts.TaxGroups.TaxableAmount = $fnumber(..KvikFactuur.GeefTotaalBelastbaar(),"",2)
-	Set ..Document.Header.Amounts.TaxGroups.TaxAmount = $fnumber(..KvikFactuur.GeefTotaalBTW(),"",2)
+	Set ..Document.Header.Amounts.TaxGroups.Tax.Percent = $fnumber((..KvikFactuur.GeefBTWPercentage() * 100),"",2)
+	Set ..Document.Header.Amounts.TaxGroups.Tax.TaxableAmount = $fnumber(..KvikFactuur.GeefTotaalBelastbaar(),"",2)
+	Set ..Document.Header.Amounts.TaxGroups.Tax.TaxAmount = $fnumber(..KvikFactuur.GeefTotaalBTW(),"",2)
 ]]></Implementation>
 </Method>
 
Index: APPS/EDIExport/FactuurVerzender/Kvik/XML/TaxGroups.cls.xml
===================================================================
diff -u
--- APPS/EDIExport/FactuurVerzender/Kvik/XML/TaxGroups.cls.xml	(revision 0)
+++ APPS/EDIExport/FactuurVerzender/Kvik/XML/TaxGroups.cls.xml	(revision 33466)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDIExport.FactuurVerzender.Kvik.XML.TaxGroups">
+<Description>
+Created from: c:/temp/kvik_custom_invoice_xml.xsd</Description>
+<ClassType>serial</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SerialObject,%XML.Adaptor</Super>
+<Inheritance>right</Inheritance>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="XMLNAME">
+<Default>TaxGroups</Default>
+</Parameter>
+
+<Parameter name="XMLSEQUENCE">
+<Default>1</Default>
+</Parameter>
+
+<Property name="Tax">
+<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="Tax"/>
+</Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>TaxGroupsState</State>
+<StreamLocation>^APPS.EDIExport.F604A.TaxGroupsS</StreamLocation>
+<Data name="TaxGroupsState">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>Tax</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>