Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r74490 -r74663
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 74490)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 74663)
@@ -142,7 +142,7 @@
 	Set BookingInfo.version = "2.0"
 	
 	Set BookingInfo.costcenter = ..BepaalCostCenter(LeveringInfo) ; --> ander afzenderadres
-	Set BookingInfo.carrier = ..BepaalBookingInfoCarrier(Rit)
+	Set BookingInfo.carrier = ..BepaalBookingInfoCarrier(Rit,LeveringInfo)
 	Quit BookingInfo
 ]]></Implementation>
 </Method>
@@ -177,7 +177,7 @@
 	}
 	set it = ##class(TECH.ListIterator).%New(LeveringInfo.VerpakkingEenheden)
 	#dim Linecounter as %Integer = 0
-	#dim Carrier as %String = ..BepaalBookingInfoCarrier(Rit)
+	#dim Carrier as %String = ..BepaalBookingInfoCarrier(Rit,LeveringInfo)
 	While (it.HasNext()){
 		Set Linecounter = Linecounter+ 1
 		#dim VerpakkingEenheid as APPS.TRANSP.dto.VerpakkingEenheid = it.Next()
@@ -562,19 +562,25 @@
 </Method>
 
 <Method name="BepaalBookingInfoCarrier">
-<FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
+<FormalSpec>Rit:DOM.TRANSP.Rit,LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
-	Quit:(Rit.GeefTransporteur() = Transporteur.VRD) "VRD"
-	Quit:(Rit.GeefTransporteur() = Transporteur.DHL) "DHP"
-	Quit:(Rit.GeefTransporteur() = Transporteur.HamannHDE) "ERB"
-	Quit:(Rit.GeefTransporteur() = Transporteur.Dachser) "DAC"
-	Quit:(Rit.GeefTransporteur() = Transporteur.Weiss) "GWE"
-	Quit:((Rit.GeefTransporteur() = Transporteur.Schenker) & $$$Not(..ProjectSettingsAPI.IsTranssmartESchenkerConnectieActief())) "SNB"
-	Quit:((Rit.GeefTransporteur() = Transporteur.Schenker) & ..ProjectSettingsAPI.IsTranssmartESchenkerConnectieActief()) "ESC"
-	Quit ""
+	#dim Carrier as %String = ""
+	Set:(Rit.GeefTransporteur() = Transporteur.VRD) Carrier = "VRD"
+	Set:(Rit.GeefTransporteur() = Transporteur.DHL) Carrier = "DHP"
+	Set:(Rit.GeefTransporteur() = Transporteur.HamannHDE) Carrier = "ERB"
+	Set:(Rit.GeefTransporteur() = Transporteur.Dachser) Carrier = "DAC"
+	Set:(Rit.GeefTransporteur() = Transporteur.Weiss) Carrier = "GWE"
+	if (Rit.GeefTransporteur() = Transporteur.Schenker){
+		Set Carrier = "SNB"
+		if (..ProjectSettingsAPI.IsTranssmartESchenkerConnectieActief() & (LeveringInfo.LeverAdres.LandCode = "CZ" ) ) {	
+			Set Carrier = "ESC"
+		}
+	}
+	
+	Quit Carrier
 ]]></Implementation>
 </Method>