Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachsermetcostcentervoorOPO/doBookingRequestDachser.xml
===================================================================
diff -u -r67784 -r67955
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachsermetcostcentervoorOPO/doBookingRequestDachser.xml	(.../doBookingRequestDachser.xml)	(revision 67784)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachsermetcostcentervoorOPO/doBookingRequestDachser.xml	(.../doBookingRequestDachser.xml)	(revision 67955)
@@ -26,7 +26,8 @@
       </additionalReference>
     </additionalReferences>
     <pickupDate>2011-07-04</pickupDate>
-    <serviceLevelTime>TARGOFLEX</serviceLevelTime>
+    <serviceLevelTime>targo-on-site</serviceLevelTime>
+    <serviceLevelOther>tail-lift-delivery</serviceLevelOther>
     <incoterms>CPT</incoterms>
     <inbound>0</inbound>
     <loadmeter>0</loadmeter>
Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r67784 -r67955
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 67784)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 67955)
@@ -136,7 +136,8 @@
 	
 	Set ShipmentInfo.reference = LeveringInfo.Referentie
 		
-	Set ShipmentInfo.serviceLevelTime = ..BepaalShipmentInfoServiceLevelTime(Rit)	
+	Set ShipmentInfo.serviceLevelTime = ..BepaalShipmentInfoServiceLevelTime(Rit,LeveringInfo)	
+	Set ShipmentInfo.serviceLevelOther = ..BepaalShipmentInfoServiceLevelOther(Rit,LeveringInfo)	
 	Set ShipmentInfo.inbound = 0
 	Set ShipmentInfo.loadmeter = 0
 	Set ShipmentInfo.pickupDate = ..BepaalPickupDate(LeveringInfo,Rit)
@@ -175,6 +176,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BepaalShipmentInfoServiceLevelOther">
+<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()
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	#dim ServiceLevelOther as %String = ""
+	If (LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.OPO) ) {
+		Set ServiceLevelOther = "tail-lift-delivery"
+	}
+	Quit ServiceLevelOther
+]]></Implementation>
+</Method>
+
 <Method name="GeefIncoterms">
 <FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -424,17 +440,23 @@
 </Method>
 
 <Method name="BepaalShipmentInfoServiceLevelTime">
-<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) "STANDARD"
-	Quit:(Rit.GeefTransporteur() = Transporteur.DHL) "EUROPLUS"
-	Quit:(Rit.GeefTransporteur() = Transporteur.HamannHDE) "NOSTACK"
-	Quit:(Rit.GeefTransporteur() = Transporteur.Dachser) "TARGOFLEX"
-	Quit ""
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	#dim ServiceLevelTime as %String = ""
+	Set:(Rit.GeefTransporteur() = Transporteur.VRD) ServiceLevelTime = "STANDARD"
+	Set:(Rit.GeefTransporteur() = Transporteur.DHL) ServiceLevelTime = "EUROPLUS"
+	Set:(Rit.GeefTransporteur() = Transporteur.HamannHDE) ServiceLevelTime = "NOSTACK"
+	If Rit.GeefTransporteur() = Transporteur.Dachser {
+		Set ServiceLevelTime = "TARGOFLEX"
+		If (LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.OPO) ) {
+			Set ServiceLevelTime = "targo-on-site"
+		}
+	}
+	Quit ServiceLevelTime
 ]]></Implementation>
 </Method>