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>