Index: vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml
===================================================================
diff -u -r74232 -r74663
--- vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 74232)
+++ vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 74663)
@@ -77,7 +77,7 @@
 	Set LeveringInfo.EmailAddressTrackTrace ="test@test.com"
 	#dim Datum as %Date = +(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog())	
 	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum,1)
-
+	Set LeveringInfo.LeverAdres.LandCode = "CZ"
 	Set RitMock = ##class(vhTest.Mock.DOM.TRANSP.Rit).%New()
 	Do RitMock.VerwachtMethodCall("GeefTransporteur").DanReturn(##class(DOM.TRANSP.enu.Transporteur).Schenker())
 	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
@@ -95,6 +95,7 @@
 	Set LeveringInfo.Gewicht = 2000
 	Set LeveringInfo.GeleverdAanKlantNummer = 37598
 	Set LeveringInfo.EmailAddressTrackTrace ="test@test.com"
+	Set LeveringInfo.LeverAdres.LandCode = "CZ"
 	#dim Datum as %Date = +(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog())	
 	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum,1)
 
@@ -115,6 +116,7 @@
 	Set LeveringInfo.Gewicht = 2500
 	Set LeveringInfo.GeleverdAanKlantNummer = 37598
 	Set LeveringInfo.EmailAddressTrackTrace ="test@test.com"
+	Set LeveringInfo.LeverAdres.LandCode = "CZ"
 	#dim Datum as %Date = +(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog())	
 	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum,1)
 
@@ -167,6 +169,50 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test doBooking Schenker SNB Met ESC NIET actief">
+<Implementation><![CDATA[
+	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoWWPalletEnHalve(26,2)
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("IsTranssmartESchenkerConnectieActief").DanReturn($$$False)
+	Set LeveringInfo.Gewicht = 3000
+	Set LeveringInfo.GeleverdAanKlantNummer = 37598
+	Set LeveringInfo.EmailAddressTrackTrace ="test@test.com"
+	Set LeveringInfo.LeverAdres.LandCode = "PL"
+	#dim Datum as %Date = +(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog())	
+	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum,1)
+
+	Set RitMock = ##class(vhTest.Mock.DOM.TRANSP.Rit).%New()
+	Do RitMock.VerwachtMethodCall("GeefTransporteur").DanReturn(##class(DOM.TRANSP.enu.Transporteur).Schenker())
+	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
+
+	set result = ..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock)
+	do $$$AssertEquals(result.bookingInfo.carrier,"SNB")
+	Do RitMock.Verifieer()
+	Do ..ProjectSettingsAPI.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test doBooking Schenker Naar Polen voorlopig SNB Met ESC actief">
+<Implementation><![CDATA[
+	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoWWPalletEnHalve(26,2)
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("IsTranssmartESchenkerConnectieActief").DanReturn($$$True)
+	Set LeveringInfo.Gewicht = 3000
+	Set LeveringInfo.GeleverdAanKlantNummer = 37598
+	Set LeveringInfo.EmailAddressTrackTrace ="test@test.com"
+	Set LeveringInfo.LeverAdres.LandCode = "PL"
+	#dim Datum as %Date = +(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog())	
+	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum,1)
+
+	Set RitMock = ##class(vhTest.Mock.DOM.TRANSP.Rit).%New()
+	Do RitMock.VerwachtMethodCall("GeefTransporteur").DanReturn(##class(DOM.TRANSP.enu.Transporteur).Schenker())
+	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
+
+	set result = ..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock)
+	do $$$AssertEquals(result.bookingInfo.carrier,"SNB")
+	Do RitMock.Verifieer()
+	Do ..ProjectSettingsAPI.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test doBooking Schenker FTL voor gewicht">
 <Implementation><![CDATA[
 	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoWWPalletEnHalve(2,2)
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>
 
Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenkerPARTLOADviagewichtESchenkerEnabled/doBookingRequestSchenker.xml
===================================================================
diff -u -r74490 -r74663
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenkerPARTLOADviagewichtESchenkerEnabled/doBookingRequestSchenker.xml	(.../doBookingRequestSchenker.xml)	(revision 74490)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenkerPARTLOADviagewichtESchenkerEnabled/doBookingRequestSchenker.xml	(.../doBookingRequestSchenker.xml)	(revision 74663)
@@ -76,7 +76,7 @@
         <street1>Ankerstraat 91</street1>
         <city>Sint-Niklaas</city>
         <zipCode>9100</zipCode>
-        <countryCode>BE</countryCode>
+        <countryCode>CZ</countryCode>
         <contact>Een Belg</contact>
         <telNo>Telefoon</telNo>
         <email>test@test.com</email>
Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenkerPREMIUMESchenkerenabled/doBookingRequestSchenker.xml
===================================================================
diff -u -r74490 -r74663
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenkerPREMIUMESchenkerenabled/doBookingRequestSchenker.xml	(.../doBookingRequestSchenker.xml)	(revision 74490)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenkerPREMIUMESchenkerenabled/doBookingRequestSchenker.xml	(.../doBookingRequestSchenker.xml)	(revision 74663)
@@ -76,7 +76,7 @@
         <street1>Ankerstraat 91</street1>
         <city>Sint-Niklaas</city>
         <zipCode>9100</zipCode>
-        <countryCode>BE</countryCode>
+        <countryCode>CZ</countryCode>
         <contact>Een Belg</contact>
         <telNo>Telefoon</telNo>
         <email>test@test.com</email>
Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenkerPARTLOADviapalettenESchenkerenabled/doBookingRequestSchenker.xml
===================================================================
diff -u -r74490 -r74663
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenkerPARTLOADviapalettenESchenkerenabled/doBookingRequestSchenker.xml	(.../doBookingRequestSchenker.xml)	(revision 74490)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenkerPARTLOADviapalettenESchenkerenabled/doBookingRequestSchenker.xml	(.../doBookingRequestSchenker.xml)	(revision 74663)
@@ -76,7 +76,7 @@
         <street1>Ankerstraat 91</street1>
         <city>Sint-Niklaas</city>
         <zipCode>9100</zipCode>
-        <countryCode>BE</countryCode>
+        <countryCode>CZ</countryCode>
         <contact>Een Belg</contact>
         <telNo>Telefoon</telNo>
         <email>test@test.com</email>