Index: vhUnitTest/AX/Uitgaand/VKP/CustomerCodexRelation/impl/CustomerCodexRelationDixfConverter/Test.cls.xml
===================================================================
diff -u -r46138 -r47885
--- vhUnitTest/AX/Uitgaand/VKP/CustomerCodexRelation/impl/CustomerCodexRelationDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 46138)
+++ vhUnitTest/AX/Uitgaand/VKP/CustomerCodexRelation/impl/CustomerCodexRelationDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47885)
@@ -11,6 +11,7 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanDoeNiks()
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
@@ -28,6 +29,7 @@
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexStandaard").ExactAantalKeer(1)
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexOrgalux").ExactAantalKeer(0)
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexTAOR").ExactAantalKeer(0)
+	Do KlantMock.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantMock,Record)
 	
@@ -45,6 +47,7 @@
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexStandaard").ExactAantalKeer(1)
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexOrgalux").ExactAantalKeer(0)
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexTAOR").ExactAantalKeer(0)
+	Do KlantMock.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantMock,Record)
 	
@@ -62,6 +65,7 @@
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexStandaard").ExactAantalKeer(0)
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexOrgalux").ExactAantalKeer(1)
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexTAOR").ExactAantalKeer(0)
+	Do KlantMock.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantMock,Record)
 	
@@ -79,6 +83,7 @@
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexStandaard").ExactAantalKeer(0)
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexOrgalux").ExactAantalKeer(0)
 	Do KlantMock.VerwachtMethodCall("GeefPrijsCodexTAOR").ExactAantalKeer(1)
+	Do KlantMock.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantMock,Record)
 	
@@ -94,10 +99,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("C")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"1 Beslag Cons excBTW")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"STD Cons")
 ]]></Implementation>
 </Method>
 
@@ -109,10 +115,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("P")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"3 Beslag Plus")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"STD Plus")
 ]]></Implementation>
 </Method>
 
@@ -124,10 +131,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("L")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"4 Beslag Lijst")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"STD Lijst")
 ]]></Implementation>
 </Method>
 
@@ -139,10 +147,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("R")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"5 Beslag Rabat")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"STD Rabat")
 ]]></Implementation>
 </Method>
 
@@ -154,10 +163,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("S")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"6 Beslag Spil")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"STD Spil")
 ]]></Implementation>
 </Method>
 
@@ -169,10 +179,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("B")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"7 Beslag Basis")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"STD Basis")
 ]]></Implementation>
 </Method>
 
@@ -184,10 +195,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("G")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"8 Beslag Groot")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"STD Groot")
 ]]></Implementation>
 </Method>
 
@@ -199,10 +211,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("C")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"1 MAL Cons excBTW")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"MAG Cons")
 ]]></Implementation>
 </Method>
 
@@ -214,10 +227,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("P")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"3 MAL Plus")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"MAG Plus")
 ]]></Implementation>
 </Method>
 
@@ -229,10 +243,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("L")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"4 MAL Lijst")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"MAG Lijst")
 ]]></Implementation>
 </Method>
 
@@ -244,10 +259,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("R")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"5 MAL Rabat")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"MAG Rabat")
 ]]></Implementation>
 </Method>
 
@@ -259,10 +275,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("S")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"6 MAL Spil")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"MAG Spil")
 ]]></Implementation>
 </Method>
 
@@ -274,10 +291,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("B")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"7 MAL Basis")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"MAG Basis")
 ]]></Implementation>
 </Method>
 
@@ -289,10 +307,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexStandaard").DanReturn("G")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"8 MAL Groot")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"MAG Groot")
 ]]></Implementation>
 </Method>
 
@@ -304,10 +323,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexOrgalux").DanReturn("C")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"1 OL Cons excBTW")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"OL Cons")
 ]]></Implementation>
 </Method>
 
@@ -319,10 +339,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexOrgalux").DanReturn("P")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"3 OL Cons excBTW")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"OL Plus")
 ]]></Implementation>
 </Method>
 
@@ -334,10 +355,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexOrgalux").DanReturn("L")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"4 OL Lijst")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"OL Lijst")
 ]]></Implementation>
 </Method>
 
@@ -349,10 +371,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexOrgalux").DanReturn("R")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"5 OL Rabat")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"OL Rabat")
 ]]></Implementation>
 </Method>
 
@@ -364,10 +387,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexOrgalux").DanReturn("S")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"6 OL Spil")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"OL Spil")
 ]]></Implementation>
 </Method>
 
@@ -379,10 +403,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexOrgalux").DanReturn("B")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"7 OL Basis")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"OL Basis")
 ]]></Implementation>
 </Method>
 
@@ -394,10 +419,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexOrgalux").DanReturn("G")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"8 OL Groot")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"OL Groot")
 ]]></Implementation>
 </Method>
 
@@ -409,10 +435,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexTAOR").DanReturn("C")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"1 TA Cons excBTW")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"TA Cons")
 ]]></Implementation>
 </Method>
 
@@ -424,10 +451,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexTAOR").DanReturn("P")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"3 TA Cons excBTW")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"TA Plus")
 ]]></Implementation>
 </Method>
 
@@ -439,10 +467,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexTAOR").DanReturn("L")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"4 TA Lijst")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"TA Lijst")
 ]]></Implementation>
 </Method>
 
@@ -454,10 +483,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexTAOR").DanReturn("R")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"5 TA Rabat")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"TA Rabat")
 ]]></Implementation>
 </Method>
 
@@ -469,10 +499,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexTAOR").DanReturn("S")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"6 TA Spil")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"TA Spil")
 ]]></Implementation>
 </Method>
 
@@ -484,10 +515,11 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexTAOR").DanReturn("B")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"7 TA Basis")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"TA Basis")
 ]]></Implementation>
 </Method>
 
@@ -499,12 +531,29 @@
 	
 	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
 	Do KlantStub.IndienMethodCall("GeefPrijsCodexTAOR").DanReturn("G")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanDoeNiks()
 	
 	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
 	
-	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"8 TA Groot")
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"TA Groot")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Als GeefBusinessType B2C teruggeeft dan is de CodexSetupId geconcateneerd met plusteken en btw">
+<Implementation><![CDATA[
+	Set Converter = ##class(AX.Uitgaand.VKP.CustomerCodexRelation.impl.CustomerCodexRelationDixfConverter).%New()
+	Set KlantStub = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
+	#dim Record As %Integer = 4
+	
+	Do KlantStub.IndienMethodCall("GeefCode").DanReturn("Dummycode1234")
+	Do KlantStub.IndienMethodCall("GeefPrijsCodexTAOR").DanReturn("G")
+	Do KlantStub.IndienMethodCall("GeefBusinessType").DanReturn(##class(DOM.VKP.enu.BusinessType).B2C())
+	
+	#dim AxCustomerCodexRelation As AXdixf.CustomerCodexRelation.CustomerCodexRelation = Converter.Convert(KlantStub,Record)
+	
+	Do $$$AssertEquals(AxCustomerCodexRelation.CodexSetupId,"TA Groot+btw")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/VKP/CustomerCodexRelation/impl/CustomerCodexRelationDixfConverter.cls.xml
===================================================================
diff -u -r46131 -r47885
--- AX/Uitgaand/VKP/CustomerCodexRelation/impl/CustomerCodexRelationDixfConverter.cls.xml	(.../CustomerCodexRelationDixfConverter.cls.xml)	(revision 46131)
+++ AX/Uitgaand/VKP/CustomerCodexRelation/impl/CustomerCodexRelationDixfConverter.cls.xml	(.../CustomerCodexRelationDixfConverter.cls.xml)	(revision 47885)
@@ -48,6 +48,10 @@
 	} ElseIf (Record = 4) {
 		Set CodexSetupId = ..BepaalCodexSetupId4(CustomerCodexRelation)
 	}
+	If ..IsPrijzenInclBTW(CustomerCodexRelation)
+	{
+		Set CodexSetupId=CodexSetupId_"+btw"
+	}
 	
 	Quit CodexSetupId
 ]]></Implementation>
@@ -62,19 +66,19 @@
 	#dim Prijsklasse As %String = CustomerCodexRelation.GeefPrijsCodexStandaard()
 	
 	If (Prijsklasse = "C") {
-		Set CodexSetupId1 = "1 Beslag Cons excBTW"
+		Set CodexSetupId1 = "STD Cons"
 	} ElseIf (Prijsklasse = "P") {
-		Set CodexSetupId1 = "3 Beslag Plus"
+		Set CodexSetupId1 = "STD Plus"
 	} ElseIf (Prijsklasse = "L") {
-		Set CodexSetupId1 = "4 Beslag Lijst"
+		Set CodexSetupId1 = "STD Lijst"
 	} ElseIf (Prijsklasse = "R") {
-		Set CodexSetupId1 = "5 Beslag Rabat"
+		Set CodexSetupId1 = "STD Rabat"
 	} ElseIf (Prijsklasse = "S") {
-		Set CodexSetupId1 = "6 Beslag Spil"
+		Set CodexSetupId1 = "STD Spil"
 	} ElseIf (Prijsklasse = "B") {
-		Set CodexSetupId1 = "7 Beslag Basis"
+		Set CodexSetupId1 = "STD Basis"
 	} ElseIf (Prijsklasse = "G") {
-		Set CodexSetupId1 = "8 Beslag Groot"
+		Set CodexSetupId1 = "STD Groot"
 	}
 	
 	Quit CodexSetupId1
@@ -90,19 +94,19 @@
 	#dim Prijsklasse As %String = CustomerCodexRelation.GeefPrijsCodexStandaard()
 	
 	If (Prijsklasse = "C") {
-		Set CodexSetupId2 = "1 MAL Cons excBTW"
+		Set CodexSetupId2 = "MAG Cons"
 	} ElseIf (Prijsklasse = "P") {
-		Set CodexSetupId2 = "3 MAL Plus"
+		Set CodexSetupId2 = "MAG Plus"
 	} ElseIf (Prijsklasse = "L") {
-		Set CodexSetupId2 = "4 MAL Lijst"
+		Set CodexSetupId2 = "MAG Lijst"
 	} ElseIf (Prijsklasse = "R") {
-		Set CodexSetupId2 = "5 MAL Rabat"
+		Set CodexSetupId2 = "MAG Rabat"
 	} ElseIf (Prijsklasse = "S") {
-		Set CodexSetupId2 = "6 MAL Spil"
+		Set CodexSetupId2 = "MAG Spil"
 	} ElseIf (Prijsklasse = "B") {
-		Set CodexSetupId2 = "7 MAL Basis"
+		Set CodexSetupId2 = "MAG Basis"
 	} ElseIf (Prijsklasse = "G") {
-		Set CodexSetupId2 = "8 MAL Groot"
+		Set CodexSetupId2 = "MAG Groot"
 	}
 	
 	Quit CodexSetupId2
@@ -118,19 +122,19 @@
 	#dim Prijsklasse As %String = CustomerCodexRelation.GeefPrijsCodexOrgalux()
 	
 	If (Prijsklasse = "C") {
-		Set CodexSetupId3 = "1 OL Cons excBTW"
+		Set CodexSetupId3 = "OL Cons"
 	} ElseIf (Prijsklasse = "P") {
-		Set CodexSetupId3 = "3 OL Cons excBTW"
+		Set CodexSetupId3 = "OL Plus"
 	} ElseIf (Prijsklasse = "L") {
-		Set CodexSetupId3 = "4 OL Lijst"
+		Set CodexSetupId3 = "OL Lijst"
 	} ElseIf (Prijsklasse = "R") {
-		Set CodexSetupId3 = "5 OL Rabat"
+		Set CodexSetupId3 = "OL Rabat"
 	} ElseIf (Prijsklasse = "S") {
-		Set CodexSetupId3 = "6 OL Spil"
+		Set CodexSetupId3 = "OL Spil"
 	} ElseIf (Prijsklasse = "B") {
-		Set CodexSetupId3 = "7 OL Basis"
+		Set CodexSetupId3 = "OL Basis"
 	} ElseIf (Prijsklasse = "G") {
-		Set CodexSetupId3 = "8 OL Groot"
+		Set CodexSetupId3 = "OL Groot"
 	}
 	
 	Quit CodexSetupId3
@@ -146,24 +150,39 @@
 	#dim Prijsklasse As %String = CustomerCodexRelation.GeefPrijsCodexTAOR()
 	
 	If (Prijsklasse = "C") {
-		Set CodexSetupId4 = "1 TA Cons excBTW"
+		Set CodexSetupId4 = "TA Cons"
 	} ElseIf (Prijsklasse = "P") {
-		Set CodexSetupId4 = "3 TA Cons excBTW"
+		Set CodexSetupId4 = "TA Plus"
 	} ElseIf (Prijsklasse = "L") {
-		Set CodexSetupId4 = "4 TA Lijst"
+		Set CodexSetupId4 = "TA Lijst"
 	} ElseIf (Prijsklasse = "R") {
-		Set CodexSetupId4 = "5 TA Rabat"
+		Set CodexSetupId4 = "TA Rabat"
 	} ElseIf (Prijsklasse = "S") {
-		Set CodexSetupId4 = "6 TA Spil"
+		Set CodexSetupId4 = "TA Spil"
 	} ElseIf (Prijsklasse = "B") {
-		Set CodexSetupId4 = "7 TA Basis"
+		Set CodexSetupId4 = "TA Basis"
 	} ElseIf (Prijsklasse = "G") {
-		Set CodexSetupId4 = "8 TA Groot"
+		Set CodexSetupId4 = "TA Groot"
 	}
 	
 	Quit CodexSetupId4
 ]]></Implementation>
 </Method>
+
+<Method name="IsPrijzenInclBTW">
+<FormalSpec>CustomerCodexRelation:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<Implementation><![CDATA[
+  	If CustomerCodexRelation.GeefBusinessType() = ##class(DOM.VKP.enu.BusinessType).B2C()
+ 	{
+	 	Set PrijzenInclBTW=1
+	}
+ 	Else
+ 	{
+	 	Set PrijzenInclBTW=0
+	}
+	Quit PrijzenInclBTW
+]]></Implementation>
+</Method>
 </Class>