Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml
===================================================================
diff -u -r34700 -r34727
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 34700)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 34727)
@@ -35,10 +35,10 @@
 <ReturnType>AXaif.Customer.AxdCustomer</ReturnType>
 <Implementation><![CDATA[
 	set PartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
-	do PartijAPI.IndienMethodCall("GeefPartij",..Partij.GeefID()).DanReturn(..Partij)
+	do PartijAPI.IndienMethodCall("GeefPartij",$$$ElkeWaarde).DanReturn(..Partij)
 	
 	set VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
-	do VerkoopAPI.IndienMethodCall("GeefKlant",..Partij.GeefID()).DanReturn(..Klant)
+	do VerkoopAPI.IndienMethodCall("GeefKlant",$$$ElkeWaarde).DanReturn(..Klant)
 	
 	Set FirmaBepaler = ##class(vhTest.Mock.AX.common.impl.FirmaBepaler).%New()
 	Do FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn(..Firma)
Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34724 -r34727
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34724)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34727)
@@ -41,14 +41,16 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AX.common.impl.FirmaBepaler).%New())
-	set ..Utils = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.Utils).%New(..FirmaBepaler)
 	
+	
 	set ..Formatter = ##class(AX.common.impl.Formatter).%New()
 	set ..Validator = ##class(AX.common.impl.Validator).%New()
 	
 	set ..PartijAPI = $$$Inject(PartijAPI,##class(DOM.DomeinContext).Instance().GeefPartijAPI())
 	set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
 	
+	set ..Utils = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.Utils).%New(..FirmaBepaler,..PartijAPI)
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -74,7 +76,7 @@
 	
 	set Custable.EnterpriseNumber = ..Formatter.FormatEnterpriseNumber(Partij.GeefBTWNr())
 	set Custable.VATNum = ..Formatter.FormatVATNum(Partij.GeefBTWNr())
-	set Custable.TaxGroup = ..Utils.ConvertTaxGroup(Partij,Klant)
+	set Custable.TaxGroup = ..Utils.ConvertTaxGroup(Klant)
 	
 	set Custable.WebSalesOrderDisplay = "All"
 	set Custable.PaymTermId = ..Formatter.ConvertPaymTermId(Klant.GeefBetalingwijze(), Klant.GeefBetalingTermijn())
Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/Utils.cls.xml
===================================================================
diff -u -r34724 -r34727
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/Utils.cls.xml	(.../Utils.cls.xml)	(revision 34724)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/Utils.cls.xml	(.../Utils.cls.xml)	(revision 34727)
@@ -8,21 +8,30 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PartijAPI">
+<Type>DOM.PARTIJ.PartijAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>FirmaBepaler:AX.common.impl.FirmaBepaler</FormalSpec>
+<FormalSpec>FirmaBepaler:AX.common.impl.FirmaBepaler,PartijAPI:DOM.PARTIJ.PartijAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AX.common.impl.FirmaBepaler).%New())
+	set ..PartijAPI = $$$Inject(PartijAPI,##class(DOM.DomeinContext).Instance().GeefPartijAPI())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="ConvertTaxGroup">
-<FormalSpec>Partij:DOM.PARTIJ.Partij,Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	#dim Partij As DOM.PARTIJ.Partij = ..PartijAPI.GeefPartij(Klant.GeefID())
+	
 	If ..FirmaBepaler.GeefInitialen()="VHBE" {
 		Quit:Partij.GeefID()="K||7587" "BUNIT"
 		Quit:Partij.GeefID()="K||4682" "BUNIT"
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34722 -r34727
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml)	(revision 34722)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml)	(revision 34727)
@@ -29,6 +29,7 @@
             <Listcode>IncludeNot</Listcode>
             <OffsetAccountType>Ledger</OffsetAccountType>
             <OffsetCompany>prbe</OffsetCompany>
+            <TaxGroup>BDOM</TaxGroup>
             <TransDate>1846-07-09</TransDate>
             <Txt>HEREMANS KEUKENS</Txt>
             <Voucher>F300500</Voucher>
Index: vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml
===================================================================
diff -u -r34719 -r34727
--- vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 34719)
+++ vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 34727)
@@ -157,6 +157,7 @@
 	do $$$AssertEquals(Transactie.LineNum,"1.0000000000")
 	do $$$AssertEquals(Transactie.OffsetAccountType,"Ledger")
 	do $$$AssertEquals(Transactie.Txt,"DE KLANTNAAM")
+	do $$$AssertEquals(Transactie.TaxGroup,"BDOM")
 	do $$$AssertEquals(Transactie.TransDate,"2011-06-30")
 	do $$$AssertEquals(Transactie.DocumentNum,"F123.456")
 	do $$$AssertEquals(Transactie.Invoice,"F123456")
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34722 -r34727
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml)	(revision 34722)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml)	(revision 34727)
@@ -29,6 +29,7 @@
             <Listcode>IncludeNot</Listcode>
             <OffsetAccountType>Ledger</OffsetAccountType>
             <OffsetCompany>prbe</OffsetCompany>
+            <TaxGroup>BDOM</TaxGroup>
             <TransDate>1846-07-09</TransDate>
             <Txt><![CDATA[L & P INTERIEURPRODUKTIE]]></Txt>
             <Voucher>F586689</Voucher>
Index: AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml
===================================================================
diff -u -r34722 -r34727
--- AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34722)
+++ AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34727)
@@ -23,6 +23,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Utils">
+<Type>AX.Uitgaand.VKP.VanHoeckeKlant.impl.Utils</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>FirmaBepaler:AX.common.impl.FirmaBepaler,VerkoopAPI:DOM.VKP.VerkoopAPI,OrderAPI:DOM.VKP.OrderAPI</FormalSpec>
 <Private>1</Private>
@@ -31,9 +36,12 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AX.common.impl.FirmaBepaler).%New())
+	set ..Utils = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.Utils).%New(..FirmaBepaler)
+	
 	set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
 	set ..OrderAPI = $$$Inject(OrderAPI,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
 	set ..Formatter = ##class(AX.common.impl.Formatter).%New()
+		
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -95,6 +103,7 @@
 	#dim Transaction As AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalTrans = ..MakeTransaction(Factuur,1)
 	set Transaction.AccountType = "Cust"
 	set Transaction.OffsetAccountType = "Ledger"
+	set Transaction.TaxGroup = ..Utils.ConvertTaxGroup(Factuur.GeefKlant())
 	
 	set Transaction.CashDiscAmount = ..Formatter.FormatNumber(Factuur.GeefTotaalKortingKontant(),2)
 
Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34700 -r34727
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34700)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34727)
@@ -769,7 +769,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: KlantenCategorie - Van Hoecke BV- IC">
+<Method name="Test: KlantenCategorie - Van Hoecke BV - IC">
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefID").DanReturn("K||9544")
 	
Index: AX/Uitgaand/common/impl/AifGenerator.cls.xml
===================================================================
diff -u -r34711 -r34727
--- AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 34711)
+++ AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 34727)
@@ -72,7 +72,7 @@
 	
 	set:Command="Customer/Create" Message.Body.MessageParts.Customer = Converter.Convert(Id)
 	set:Command="SalesInvoice/Create" Message.Body.MessageParts.LedgerGeneralJournal = Converter.Convert(Id)
-		
+			
 	#dim Path As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_AIF"),"Inbound")
 	#dim Filename As %String = $replace(Command,"/","-")_" "_$replace(Id,"|","")_" "_" - "_..FirmaBepaler.GeefInitialen()_" - "_##class(TECH.Files).GeefCurrentTimeStamp()_".xml"
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(Path,Filename)