Index: APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml
===================================================================
diff -u -r50826 -r50828
--- APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 50826)
+++ APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 50828)
@@ -90,13 +90,16 @@
 		Set Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
 		#dim Url As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("VhisieURL")_"?REF=" _ ..GeefRef(KlantID, Personality.GeefID(), Modus, Offerte.GeefID())	
 	} elseif WebshopVersie = ##class(APPS.EC.enu.WebshopVersie).V4() {
+		#dim Taalcode As %String
 		If $IsObject(Offerte.GeefOfferteVanHandel()) {
 			Set Url = ..UrlBepaler.GeefUrl(Offerte.GeefOfferteVanHandel().GeefPersonalityID(),WebshopVersie)
+			Set Taalcode = ..ConverteerTaal(Offerte.GeefOfferteVanHandel().GeefPersonality().GeefTaal())
+			Set Url = Url_"/user/login?destination=cart/switch/"_Offerte.GeefOfferteVanHandel().GeefExterneId()_"?destination="_Taalcode_"/cart"
 		} Else {
 			Set Url = ..UrlBepaler.GeefUrl(Offerte.GeefPersonalityID(),WebshopVersie)
+			Set Taalcode = ..ConverteerTaal(Offerte.GeefPersonality().GeefTaal())
+			Set Url = Url_"/user/login?destination=cart/switch/"_Offerte.GeefExterneId()_"?destination="_Taalcode_"/cart"
 		}
-		#dim Taalcode As %String = ..ConverteerTaal(Personality.GeefTaal())
-		Set Url = Url_"/user/login?destination=cart/switch/"_Offerte.GeefOfferteVanHandel().GeefExterneId()_"?destination="_Taalcode_"/cart"
 	} else {
 		do ##class(TECH.Exceptions.IllegalUsageException).Throw("Url kan niet bepaald worden voor webshopversie '"_WebshopVersie_"' en personality '"_Personality.GeefNaam()_"'.")
 	}
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestSeefelder.cls.xml
===================================================================
diff -u -r50511 -r50828
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestSeefelder.cls.xml	(.../TestSeefelder.cls.xml)	(revision 50511)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestSeefelder.cls.xml	(.../TestSeefelder.cls.xml)	(revision 50828)
@@ -55,14 +55,14 @@
 <Method name="GeefLink">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "http://webshopV4.seefelder.de/user/login?destination=cart/switch/789654?destination=/cart"
+<Implementation><![CDATA[	Quit "http://webshopV4.seefelder.de/user/login?destination=cart/switch/789654?destination=nl/cart"
 ]]></Implementation>
 </Method>
 
 <Method name="GeefVerwerkBestellingUrl">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "http://webshopV4.hein.de/user/login?destination=cart/switch/789654?destination=/cart"
+<Implementation><![CDATA[	Quit "http://webshopV4.hein.de/user/login?destination=cart/switch/789654?destination=nl/cart"
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestHein.cls.xml
===================================================================
diff -u -r50511 -r50828
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestHein.cls.xml	(.../TestHein.cls.xml)	(revision 50511)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestHein.cls.xml	(.../TestHein.cls.xml)	(revision 50828)
@@ -56,14 +56,14 @@
 <Method name="GeefLink">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "http://webshopV4.hein.de/user/login?destination=cart/switch/789654?destination=/cart"
+<Implementation><![CDATA[	Quit "http://webshopV4.hein.de/user/login?destination=cart/switch/789654?destination=nl/cart"
 ]]></Implementation>
 </Method>
 
 <Method name="GeefVerwerkBestellingUrl">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "http://webshopV4.vanhoecke.be/user/login?destination=cart/switch/789654?destination=/cart"
+<Implementation><![CDATA[	Quit "http://webshopV4.vanhoecke.be/user/login?destination=cart/switch/789654?destination=nl/cart"
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml
===================================================================
diff -u -r50511 -r50828
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml	(.../Base.cls.xml)	(revision 50511)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml	(.../Base.cls.xml)	(revision 50828)
@@ -35,7 +35,6 @@
 	
 	Set ..Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(..GeefPersonalityID())
 	Set ..HandelPrefix = ..Personality.GeefPrefix()
-	Set ..Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(..GeefPersonalityID())
 	
 	#Dim UrlBepaler As vhTest.Fake.APPS.EC.Webshop.UrlBepaler = ##class(vhTest.Fake.APPS.EC.Webshop.UrlBepaler).%New()
 	
@@ -64,6 +63,7 @@
 	#Dim OfferteVanHandelDummy As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
 	Do OfferteVanHandelDummy.IndienMethodCall("GeefExterneId").DanReturn(789654)
 	Do OfferteVanHandelDummy.IndienMethodCall("GeefPersonalityID").DanReturn(..GeefPersonalityIdVanOfferteVanHandel())
+	Do OfferteVanHandelDummy.IndienMethodCall("GeefPersonality").DanReturn(..Personality)
 	
 	Set DocumentReferenties.OrderReferentie = "DummyOrderRef"