Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestSeefelder.cls.xml
===================================================================
diff -u -r46880 -r47073
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestSeefelder.cls.xml	(.../TestSeefelder.cls.xml)	(revision 46880)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestSeefelder.cls.xml	(.../TestSeefelder.cls.xml)	(revision 47073)
@@ -77,6 +77,13 @@
 <Implementation><![CDATA[	Quit "F. Hein GmbH"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefExterneId">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "789654"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestVanRaemdonck.cls.xml
===================================================================
diff -u -r46768 -r47073
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestVanRaemdonck.cls.xml	(.../TestVanRaemdonck.cls.xml)	(revision 46768)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestVanRaemdonck.cls.xml	(.../TestVanRaemdonck.cls.xml)	(revision 47073)
@@ -84,6 +84,13 @@
 <Implementation><![CDATA[	Quit "Van Hoecke nv"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefExterneId">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDestil.cls.xml
===================================================================
diff -u -r46768 -r47073
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDestil.cls.xml	(.../TestDestil.cls.xml)	(revision 46768)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDestil.cls.xml	(.../TestDestil.cls.xml)	(revision 47073)
@@ -78,6 +78,13 @@
 <Implementation><![CDATA[	Quit "Van Hoecke nv"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefExterneId">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestKisch.cls.xml
===================================================================
diff -u -r46768 -r47073
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestKisch.cls.xml	(.../TestKisch.cls.xml)	(revision 46768)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestKisch.cls.xml	(.../TestKisch.cls.xml)	(revision 47073)
@@ -83,6 +83,13 @@
 <Implementation><![CDATA[	Quit "Van Hoecke nv"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefExterneId">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/Base.cls.xml
===================================================================
diff -u -r46768 -r47073
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/Base.cls.xml	(.../Base.cls.xml)	(revision 46768)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/Base.cls.xml	(.../Base.cls.xml)	(revision 47073)
@@ -55,6 +55,8 @@
 	
 	#Dim DocumentReferenties As DOM.VKP.DocumentReferenties = ##class(DOM.VKP.DocumentReferenties).%New()
 	#Dim OfferteStub As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	#Dim OfferteVanHandelDummy As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteVanHandelDummy.IndienMethodCall("GeefExterneId").DanReturn(789654)
 	
 	Set DocumentReferenties.OrderReferentie = "DummyOrderRef"
 	
@@ -67,7 +69,8 @@
 	Do OfferteStub.IndienMethodCall("GeefDocumentReferenties").DanReturn(DocumentReferenties)
 	Do OfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Geen())
 	Do OfferteStub.IndienMethodCall("GeefWebshopVersie").DanReturn(..GeefWebshopVersie())
-	Do OfferteStub.IndienMethodCall("GeefExterneId").DanReturn(789654)
+	Do OfferteStub.IndienMethodCall("GeefExterneId").DanReturn(..GeefExterneId())
+	Do OfferteStub.IndienMethodCall("GeefOfferteVanHandel").DanReturn(OfferteVanHandelDummy)
 	
 	Set MailApi = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).%New()
 	
@@ -104,7 +107,11 @@
 	Do $$$AssertEqualsList(Mail.GeefOntvangers(),..GeefVerwachteOntvangers())
 	
 	Do $$$AssertEquals(Mail.GeefVerzender(),"webshop@vanhoecke.be")
-	Do $$$AssertEquals(Mail.GeefOnderwerp(),"[BesteldeOfferteHandelOnderwerp]: "_$$$DummyString)
+	If ..GeefExterneId(){
+		Do $$$AssertEquals(Mail.GeefOnderwerp(),"[BesteldeOfferteHandelOnderwerp]: "_..GeefExterneId())
+	} Else {
+		Do $$$AssertEquals(Mail.GeefOnderwerp(),"[BesteldeOfferteHandelOnderwerp]: "_$$$DummyString)
+	}
 	
 	Do ..AssertInhoud(Mail.GeefInhoud())
 ]]></Implementation>
@@ -155,14 +162,24 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="GeefExterneId">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="AssertInhoud">
 <FormalSpec>Inhoud:%Stream</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelAanspreking], <BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "<BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelIntro]<BR>")
-	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelBestellingLabel]: " _ $$$DummyString _ "<BR>")
+	If ..GeefExterneId(){
+		Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelBestellingLabel]: " _ ..GeefExterneId() _ "<BR>")
+	} Else {
+		Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelBestellingLabel]: " _ $$$DummyString _ "<BR>")
+	}
 	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelKlantLabel]: " _ "<BR>")
 	
 	Do ..AssertKlantReferentie(Inhoud.ReadLine())
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDaro.cls.xml
===================================================================
diff -u -r46768 -r47073
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDaro.cls.xml	(.../TestDaro.cls.xml)	(revision 46768)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDaro.cls.xml	(.../TestDaro.cls.xml)	(revision 47073)
@@ -84,6 +84,13 @@
 <Implementation><![CDATA[	Quit "Van Hoecke nv"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefExterneId">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml
===================================================================
diff -u -r47046 -r47073
--- APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 47046)
+++ APPS/EC/Webshop/impl/OfferteUrlBepaler.cls.xml	(.../OfferteUrlBepaler.cls.xml)	(revision 47073)
@@ -85,7 +85,7 @@
 		#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() {
 		Set Personality = Offerte.GeefPersonality()
-		Set Url = ..UrlBepaler.GeefUrl(Personality.GeefLeverancierData().PersonalityId,WebshopVersie)
+		Set Url = ..UrlBepaler.GeefUrl(Personality.GeefID(),WebshopVersie)
 		Set Url = Url_"/user/login?destination=cart/switch/"_Offerte.GeefOfferteVanHandel().GeefExterneId()_"?destination=/cart"
 	} else {
 		do ##class(TECH.Exceptions.IllegalUsageException).Throw("Url kan niet bepaald worden voor webshopversie '"_WebshopVersie_"' en personality '"_Personality.GeefNaam()_"'.")
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestHein.cls.xml
===================================================================
diff -u -r46768 -r47073
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestHein.cls.xml	(.../TestHein.cls.xml)	(revision 46768)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestHein.cls.xml	(.../TestHein.cls.xml)	(revision 47073)
@@ -7,7 +7,7 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(aTestName)
-	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_Seefelder", "http://webshopV4.hein.de", ..#Applicatie)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("APPS.EC.impl.Webshop.UrlBepaler_V4_Hein", "http://webshopV4.hein.de", ..#Applicatie)
 ]]></Implementation>
 </Method>
 
@@ -77,6 +77,13 @@
 <Implementation><![CDATA[	Quit "Van Hoecke nv"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefExterneId">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "789654"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDupont.cls.xml
===================================================================
diff -u -r46768 -r47073
--- vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDupont.cls.xml	(.../TestDupont.cls.xml)	(revision 46768)
+++ vhUnitTest/APPS/EC/impl/HandelRapporteur/Rapporteer/TestDupont.cls.xml	(.../TestDupont.cls.xml)	(revision 47073)
@@ -77,6 +77,13 @@
 <Implementation><![CDATA[	Quit "Van Hoecke nv"
 ]]></Implementation>
 </Method>
+
+<Method name="GeefExterneId">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>