Index: vhTest/Mock/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml
===================================================================
diff -u -r67199 -r67201
--- vhTest/Mock/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67199)
+++ vhTest/Mock/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67201)
@@ -15,6 +15,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVariantenVanTypeVoorPersonality">
+<FormalSpec>VariantTypeVanXML:%String,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVariantenVanTypeVoorPersonality",VariantTypeVanXML,PersonalityID)
+]]></Implementation>
+</Method>
+
 <Method name="GeefVariantenVoorPersonality">
 <FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
Index: APPS/VKP/Korting/impl/KortingService.cls.xml
===================================================================
diff -u -r67199 -r67201
--- APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 67199)
+++ APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 67201)
@@ -60,29 +60,27 @@
 <Private>1</Private>
 <ReturnType>%ArrayOfObjects</ReturnType>
 <Implementation><![CDATA[
-	#dim Varianten As %List = ..KortingServiceHelper.GeefVariantenVoorPersonality(PersonalityID)
+	#dim VariantenVanType As %List
 	#dim KortingConfiguratieArray As Array Of APPS.VKP.dto.KortingConfiguratie = ##class(%ArrayOfObjects).%New()
 	
-	#dim KortingenVoorKlantIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Customer.Reduction)
+	#dim KortingenVoorKlantVanuitXMLIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Customer.Reduction)
 	#dim EnuVariant As DOM.PM.enu.Variant
 	#dim Index As %Integer
-	While KortingenVoorKlantIterator.HasNext()
+	While KortingenVoorKlantVanuitXMLIterator.HasNext()
 	{
-		#dim KortingFactor As %Numeric = KortingenVoorKlantIterator.Next()
+		#dim KortingFactor As %Numeric = KortingenVoorKlantVanuitXMLIterator.Next()
 		#dim KortingPercentage As TECH.Percentage = KortingFactor / 100
-		#dim Variant As %String = KortingenVoorKlantIterator.Key()
+		#dim VariantTypeVanXML As %String = KortingenVoorKlantVanuitXMLIterator.Key()
 		
-		If (Variant = "TBX") {
-			For Index = 1 : 1 : $ListLength(Varianten) {
-				Set EnuVariant = $List(Varianten, Index)
-				Do KortingConfiguratieArray.SetAt(..GeefKortingConfiguratie(KlantID, EnuVariant, KortingPercentage, PersonalityID), EnuVariant)
-			}
-		} Else {
-			Set EnuVariant = ..KortingServiceHelper.GeefVariant(Variant)
+		Set VariantenVanType = ..KortingServiceHelper.GeefVariantenVanTypeVoorPersonality(VariantTypeVanXML, PersonalityID)
+		For Index = 1 : 1 : $ListLength(VariantenVanType) {
+			Set EnuVariant = $List(VariantenVanType, Index)
 			Do KortingConfiguratieArray.SetAt(..GeefKortingConfiguratie(KlantID, EnuVariant, KortingPercentage, PersonalityID), EnuVariant)
 		}
 	}
 	
+	// Check of alle kortingen hierna gezet zijn
+	
 	Quit KortingConfiguratieArray
 ]]></Implementation>
 </Method>
Index: vhTest/Fake/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml
===================================================================
diff -u -r67196 -r67201
--- vhTest/Fake/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67196)
+++ vhTest/Fake/APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67201)
@@ -21,6 +21,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVariantenVanTypeVoorPersonality">
+<FormalSpec>VariantTypeVanXML:%String,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="IsNietBEHaefelePersonality">
 <FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
Index: APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml
===================================================================
diff -u -r67199 -r67201
--- APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67199)
+++ APPS/VKP/Korting/impl/KortingService/KortingServiceHelper.cls.xml	(.../KortingServiceHelper.cls.xml)	(revision 67201)
@@ -16,15 +16,49 @@
 		Set Varianten = $ListBuild(##class(DOM.PM.enu.Variant).TandemboxAntaro())
 	}
 	
-	#dim KopieerKortingVanTbxNaarAndereTypes As %Boolean = ..IsNietBEHaefelePersonality(PersonalityID)
-	If KopieerKortingVanTbxNaarAndereTypes {
+	#dim IsNietBEHaefelePersonality As %Boolean = ..IsNietBEHaefelePersonality(PersonalityID)
+	If IsNietBEHaefelePersonality {
 		Set Varianten = Varianten _ $ListBuild(##class(DOM.PM.enu.Variant).LegraboxPure()) _ $ListBuild(##class(DOM.PM.enu.Variant).Taorbox())
 	}
 	
 	Quit Varianten
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVariantenVanTypeVoorPersonality">
+<FormalSpec>VariantTypeVanXML:%String,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	If (VariantTypeVanXML = "TBX") {
+		Quit ..GeefTbxVariantenVoorPersonality(PersonalityID)
+	} ElseIf (VariantTypeVanXML = "LBX") {
+		Quit $ListBuild(##class(DOM.PM.enu.Variant).LegraboxPure())
+	} ElseIf (VariantTypeVanXML = "TAX") {
+		Quit $ListBuild(##class(DOM.PM.enu.Variant).Taorbox())
+	} ElseIf (VariantTypeVanXML = "OL") {
+		Quit $ListBuild(##class(DOM.PM.enu.Variant).Orgalux())
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefTbxVariantenVoorPersonality">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	#dim TbxVarianten As %List
+	
+	If (PersonalityID = ##class(DOM.common.enu.Personality).HaefeleBE()) {
+		Set TbxVarianten = $ListBuild(##class(DOM.PM.enu.Variant).TandemboxIntivo(), ##class(DOM.PM.enu.Variant).TandemboxAntaro(), ##class(DOM.PM.enu.Variant).TandemboxPlus())
+	}
+	Else {
+		Set TbxVarianten = $ListBuild(##class(DOM.PM.enu.Variant).TandemboxAntaro())
+	}
+	
+	Quit TbxVarianten
+]]></Implementation>
+</Method>
+
 <Method name="GeefVariant">
 <FormalSpec>Variant:%String</FormalSpec>
 <ReturnType>DOM.PM.enu.Variant</ReturnType>