Index: APPS/VKP/KlantBeheerService.cls.xml
===================================================================
diff -u -r29059 -r47265
--- APPS/VKP/KlantBeheerService.cls.xml	(.../KlantBeheerService.cls.xml)	(revision 29059)
+++ APPS/VKP/KlantBeheerService.cls.xml	(.../KlantBeheerService.cls.xml)	(revision 47265)
@@ -29,10 +29,10 @@
 <FormalSpec>VorigKlantID:DOM.VKP.VanHoeckeKlantID,NieuwKlantID:DOM.VKP.VanHoeckeKlantID</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim Query As %String = "UPDATE APPS_VKP_impl.Offerte SET KlantID = ? WHERE KlantID = ?"
+	#dim Query As %String = "UPDATE APPS_VKP_impl.Offerte SET KlantID = ? WHERE KlantID = ? AND ExterneId is null"
 	Do ExecDynQuery^vhLib.Query(Query,$LB(NieuwKlantID,VorigKlantID))
 	
-	Set Query = "UPDATE DOM_EC_Winkelkar.Winkelkar SET KlantID = ? WHERE KlantID = ?"
+	Set Query = "UPDATE DOM_EC_Winkelkar.Winkelkar SET KlantID = ? WHERE KlantID = ? AND ExterneId is null"
 	Do ExecDynQuery^vhLib.Query(Query,$LB(NieuwKlantID,VorigKlantID))
 ]]></Implementation>
 </Method>
Index: APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteConverterFactory.cls.xml
===================================================================
diff -u -r46836 -r47265
--- APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteConverterFactory.cls.xml	(.../KlantBestellingNaarLeverancierOfferteConverterFactory.cls.xml)	(revision 46836)
+++ APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteConverterFactory.cls.xml	(.../KlantBestellingNaarLeverancierOfferteConverterFactory.cls.xml)	(revision 47265)
@@ -36,7 +36,7 @@
 	
 	#dim LeverancierPersonality As DOM.common.Personality = ..PersonalityRepo.GeefViaID(KlantBestelling.GeefPersonality().GeefLeverancierData().PersonalityId)
 	
-	#dim WebshopVersie As APPS.EC.enu.WebshopVersie = ..WebshopService.GeefVersie(LeverancierPersonality)
+	#dim WebshopVersie As APPS.EC.enu.WebshopVersie = $$$If(KlantBestelling.GeefExterneId()="","V3","V4")
 	
 	if WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V3() {
 		set Converter = ##class(APPS.VKP.Offerte.impl.KlantBestellingNaarLeverancierOfferteConverterVhisie3).%New()
Index: APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteConverterVhisie4.cls.xml
===================================================================
diff -u -r46871 -r47265
--- APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteConverterVhisie4.cls.xml	(.../KlantBestellingNaarLeverancierOfferteConverterVhisie4.cls.xml)	(revision 46871)
+++ APPS/VKP/Offerte/impl/KlantBestellingNaarLeverancierOfferteConverterVhisie4.cls.xml	(.../KlantBestellingNaarLeverancierOfferteConverterVhisie4.cls.xml)	(revision 47265)
@@ -96,7 +96,7 @@
 		
 	Do ..VerwijderOfferte(TijdelijkeLeverancierOfferte)
 	
-	Do:$$$Not(IsBewarenWinkelkarGelukt) Exception.Throw()
+	Do:$$$Not(IsBewarenWinkelkarGelukt) Exception.Rethrow()
 		
 	#dim LeverancierOfferte As APPS.VKP.Offerte = ..Vhisie4WinkelkarRepository.GeefOfferteViaID(ExterneId)
 	Do ..OfferteService.KoppelAanOfferteVanHandel(KlantBestelling,LeverancierOfferte)