Index: APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml
===================================================================
diff -u -r71264 -r71274
--- APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 71264)
+++ APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 71274)
@@ -180,7 +180,9 @@
 	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
 	
 	#dim Url as %String = Response.shipmentInfo.trackingUrl
-	
+	If (Url = "TEST") { // ERKA geeft dit om de een de ander reden terug als url.
+		Set Url = ""
+	}
 	If (Response.shipmentInfo.carrier = Transporteur.Schenker) {
 		Set Url = "https://www.dbschenker.com/app/tracking-public/?refNumber=" _ Response.shipmentInfo.reference _ "&refType=ShippersRefNo"	
 	}
Index: APPS/OV/impl/TranssmartTrackAndTrace.cls.xml
===================================================================
diff -u -r61263 -r71274
--- APPS/OV/impl/TranssmartTrackAndTrace.cls.xml	(.../TranssmartTrackAndTrace.cls.xml)	(revision 61263)
+++ APPS/OV/impl/TranssmartTrackAndTrace.cls.xml	(.../TranssmartTrackAndTrace.cls.xml)	(revision 71274)
@@ -39,13 +39,11 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>CommunicatieServiceLocator:APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..CommunicatieServiceLocator = $$$Inject(CommunicatieServiceLocator,##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New())
 	set ..TransportApi = ##class(DOM.DomeinContext).Instance().GeefTransportAPI() 
 	Quit $$$OK
 ]]></Implementation>
@@ -72,50 +70,13 @@
 <Implementation><![CDATA[
 	#dim URL As %String = ""
 
-	If Transporteur = ##class(DOM.TRANSP.enu.Transporteur).VRD() {
-		set URL = ..GeefFreightTrackAndTraceURL(Levering,Taal)
-	} elseif  Transporteur = ##class(DOM.TRANSP.enu.Transporteur).DHL() {
-		set URL = ..GeefParcelTrackAndTraceURL(Levering,Taal)
-	} else {
-		set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Voor transporteur '"_Transporteur_"' is Track And Trace niet mogelijk. Levering: "_Levering.GeefID())
-		do ##class(TECH.ExceptionHandler).Throw(Exception)
-	}
+	#dim DistributeurData As APPS.TRANSP.Transsmart.data.VerzendData = ..GeefLeveringVerzendData(Levering)
+	Set URL = DistributeurData.TrackAndTraceUrl	
 
 	Quit URL
 ]]></Implementation>
 </Method>
 
-<Method name="GeefHamannTrackAndTraceURL">
-<FormalSpec>Levering:DOM.TRANSP.Levering,Taal:DOM.enu.Taal</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim DistributeurData As APPS.TRANSP.Transsmart.data.VerzendData = ..GeefLeveringVerzendData(Levering)
-	#dim URL As %String = DistributeurData.TrackAndTraceUrl	
-	quit URL
-]]></Implementation>
-</Method>
-
-<Method name="GeefFreightTrackAndTraceURL">
-<FormalSpec>Levering:DOM.TRANSP.Levering,Taal:DOM.enu.Taal</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim DistributeurData As APPS.TRANSP.Transsmart.data.VerzendData = ..GeefLeveringVerzendData(Levering)
-	#dim URL As %String = DistributeurData.TrackAndTraceUrl	
-	quit URL
-]]></Implementation>
-</Method>
-
-<Method name="GeefParcelTrackAndTraceURL">
-<FormalSpec>Levering:DOM.TRANSP.Levering,Taal:DOM.enu.Taal</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim DistributeurData As APPS.TRANSP.Transsmart.data.VerzendData = ..GeefLeveringVerzendData(Levering)
-	#dim URL As %String = DistributeurData.TrackAndTraceUrl
-	
-	quit URL
-]]></Implementation>
-</Method>
-
 <Method name="GeefLeveringVerzendData">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <Private>1</Private>