Index: vhTest/Integratie/Webshop/Offerte/IngaveTotBestelling/Test.cls.xml
===================================================================
diff -u -r46561 -r46838
--- vhTest/Integratie/Webshop/Offerte/IngaveTotBestelling/Test.cls.xml	(.../Test.cls.xml)	(revision 46561)
+++ vhTest/Integratie/Webshop/Offerte/IngaveTotBestelling/Test.cls.xml	(.../Test.cls.xml)	(revision 46838)
@@ -77,6 +77,14 @@
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_Daro", "http://integratietest_V4.daro.com", ..#Applicatie)
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_HaefeleBE", "http://integratietest_V4.haefele.be", ..#Applicatie)
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_Hein", "http://integratietest_V4.hein.be", ..#Applicatie)
+	
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("Personality_WebshopVersie_SFS", ##class(APPS.EC.enu.WebshopVersie).V3(), ..#Applicatie)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("Personality_WebshopVersie_VanHoecke", ##class(APPS.EC.enu.WebshopVersie).V3(), ..#Applicatie)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("Personality_WebshopVersie_Dupont", ##class(APPS.EC.enu.WebshopVersie).V3(), ..#Applicatie)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("Personality_WebshopVersie_Destil", ##class(APPS.EC.enu.WebshopVersie).V3(), ..#Applicatie)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("Personality_WebshopVersie_Daro", ##class(APPS.EC.enu.WebshopVersie).V3(), ..#Applicatie)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("Personality_WebshopVersie_HaefeleBE", ##class(APPS.EC.enu.WebshopVersie).V3(), ..#Applicatie)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("Personality_WebshopVersie_Hein", ##class(APPS.EC.enu.WebshopVersie).V3(), ..#Applicatie)
 
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("VhisieURL", "http://localhost/vhisie/vhisie.html", ..#Applicatie)
 
Index: APPS/VKP/impl/OfferteService.cls.xml
===================================================================
diff -u -r45154 -r46838
--- APPS/VKP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 45154)
+++ APPS/VKP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 46838)
@@ -239,17 +239,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefKlantBestellingNaarLeverancierOfferteConverter">
-<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
-<Implementation><![CDATA[
-	If Offerte.IsVhisie4() {
-		Quit ##class(APPS.VKP.Offerte.impl.KlantBestellingNaarLeverancierOfferteConverterVhisie4).%New()
-	} Else {
-		Quit ##class(APPS.VKP.Offerte.impl.KlantBestellingNaarLeverancierOfferteConverterVhisie3).%New()
-	}
-]]></Implementation>
-</Method>
-
 <Method name="GeefOffertes">
 <FormalSpec>SelectieCriteria:APPS.VKP.Offerte.dto.SelectieCriteria</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteVerwerker.cls.xml
===================================================================
diff -u -r46824 -r46838
--- APPS/VKP/Offerte/impl/BesteldeOfferteVerwerker.cls.xml	(.../BesteldeOfferteVerwerker.cls.xml)	(revision 46824)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteVerwerker.cls.xml	(.../BesteldeOfferteVerwerker.cls.xml)	(revision 46838)
@@ -1,55 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.VKP.Offerte.impl.BesteldeOfferteVerwerker">
-<Super>DOM.common.VanHoeckeOfAnderePersonalityVisitor,APPS.VKP.Offerte.BesteldeOfferteVerwerker</Super>
+<Super>TECH.RegisteredObject,APPS.VKP.Offerte.BesteldeOfferteVerwerker</Super>
 
-<Property name="KlantBestelling">
-<Type>APPS.VKP.Offerte</Type>
+<Property name="KlantBestellingMelder">
+<Type>APPS.VKP.Offerte.BesteldeOfferteMelder</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="KlantBestellingMelder">
-<Type>APPS.VKP.Offerte.BesteldeOfferteMelder</Type>
+<Property name="ConverterFactory">
+<Type>APPS.VKP.Offerte.KlantBestellingNaarLeverancierOfferteConverterFactory</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>KlantBestellingMelder:APPS.VKP.Offerte.BesteldeOfferteMelder</FormalSpec>
+<FormalSpec>KlantBestellingMelder:APPS.VKP.Offerte.BesteldeOfferteMelder,ConverterFactory:APPS.VKP.Offerte.KlantBestellingNaarLeverancierOfferteConverterFactory</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..KlantBestellingMelder = $$$Inject(KlantBestellingMelder, ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder).%New())
+	set ..ConverterFactory = $$$Inject(ConverterFactory,##class(APPS.VKP.Offerte.impl.KlantBestellingNaarLeverancierOfferteConverterFactory).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="StartVerwerking">
 <FormalSpec>KlantBestelling:APPS.VKP.Offerte</FormalSpec>
 <Implementation><![CDATA[
-	Set ..KlantBestelling = KlantBestelling
-	#dim Personality As DOM.common.Personality = KlantBestelling.GeefPersonality()
-	Do Personality.Accept($this)
+	Do ..ConverterFactory.GeefConverter(KlantBestelling).Converteer(KlantBestelling)
+	Do ..KlantBestellingMelder.VerwittigVerwerker(KlantBestelling)
 ]]></Implementation>
 </Method>
-
-<Method name="VerwerkVanHoecke">
-<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
-<Implementation><![CDATA[	Do ..KlantBestellingMelder.VerwittigVerwerker(..KlantBestelling)
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkAnderePersonality">
-<FormalSpec>Personality:DOM.common.Personality</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim KlantBestellingNaarLeverancierOfferteConverter As APPS.VKP.Offerte.KlantBestellingNaarLeverancierOfferteConverter = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService().GeefKlantBestellingNaarLeverancierOfferteConverter(..KlantBestelling)
-	Do KlantBestellingNaarLeverancierOfferteConverter.Converteer(..KlantBestelling)
-	
-	Do ..KlantBestellingMelder.VerwittigVerwerker(..KlantBestelling)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: APPS/VKP/OfferteService.cls.xml
===================================================================
diff -u -r45154 -r46838
--- APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 45154)
+++ APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 46838)
@@ -36,10 +36,6 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="GeefKlantBestellingNaarLeverancierOfferteConverter">
-<Abstract>1</Abstract>
-</Method>
-
 <Method name="GeefMaatwerkLijnenIterator">
 <Abstract>1</Abstract>
 <ReturnType>TECH.Iterator</ReturnType>
Index: vhTest/Mock/APPS/VKP/OfferteService.cls.xml
===================================================================
diff -u -r45154 -r46838
--- vhTest/Mock/APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 45154)
+++ vhTest/Mock/APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 46838)
@@ -34,11 +34,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefKlantBestellingNaarLeverancierOfferteConverter">
-<Implementation><![CDATA[	do ..VerwerkMethodCall("GeefKlantBestellingNaarLeverancierOfferteConverter")
-]]></Implementation>
-</Method>
-
 <Method name="GeefLeverAdres">
 <FormalSpec>OfferteID:%String</FormalSpec>
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>