Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r71194 -r71196
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 71194)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 71196)
@@ -158,7 +158,7 @@
 	Set ShipmentInfo.loadmeter = 0
 	Set ShipmentInfo.pickupDate = ..BepaalPickupDate(LeveringInfo,Rit)
 	Set ShipmentInfo.noOfPackages = LeveringInfo.AantalVerpakkingEenhedenTotaal
-	Set ShipmentInfo.instruction = ..GeefInstruction(LeveringInfo)
+	Set ShipmentInfo.instruction = ..GeefInstruction(LeveringInfo,Rit)
 	Set ShipmentInfo.incoterms = ..GeefIncoterms(Rit,LeveringInfo)
 	if (Rit.GeefTransporteur() = Transporteur.VRD) {
 		Set ShipmentInfo.requestedDeliveryDate = ##class(TECH.Format.impl.FormatAPI).%New().FormatHorolog(LeveringInfo.AfleverDatum,"JJJJ-MM-DD")
@@ -181,8 +181,7 @@
 	}
 	
 	Do ShipmentInfo.addresses.Insert(..GeefAfzenderAdres(LeveringInfo))
-	Do ShipmentInfo.addresses.Insert(..GeefBestemmelingAdres(LeveringInfo,Rit))
-	
+	Do ShipmentInfo.addresses.Insert(..GeefBestemmelingAdres(LeveringInfo,Rit))	
 	Do ShipmentInfo.additionalReferences.Insert(..GeefVrachtwagenAdditionalReference(Rit))
 	Do ShipmentInfo.additionalReferences.Insert(..GeefKlantAdditionalReference(LeveringInfo))
 	Do ShipmentInfo.additionalReferences.Insert(..GeefZendingAdditionalReference(LeveringInfo))
@@ -233,7 +232,7 @@
 	If (Rit.GeefTransporteur() = Transporteur.Schenker) {
 		
 		If (LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.BlumPolen) ) {
-			Set Incoterms = "DAP"
+			Set Incoterms = "EXW"
 		}
 
 	} 
@@ -314,10 +313,13 @@
 </Method>
 
 <Method name="GeefInstruction">
-<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit</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 LeveringAdres As APPS.TRANSP.dto.LeveringAdres = LeveringInfo.LeverAdres
 	#dim Instruction as %String = ""
 	If (LeveringAdres.Opmerkingen.Count() > 0) {
@@ -326,6 +328,9 @@
 	If (LeveringAdres.Opmerkingen.Count() > 1) {
 		set Instruction = Instruction _ $Select($Length(Instruction):" ",1:"")_ LeveringAdres.Opmerkingen.GetAt(2)
 	}
+	If (Rit.GeefTransporteur() = Transporteur.Schenker) && (LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.BlumPolen)) {
+		Set Instruction = "Dostawa autem z winda"
+	}
 	Quit ..BeperkLengteTot(Instruction,128)
 ]]></Implementation>
 </Method>
Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenker/doBookingRequestSchenker.xml
===================================================================
diff -u -r71194 -r71196
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenker/doBookingRequestSchenker.xml	(.../doBookingRequestSchenker.xml)	(revision 71194)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenker/doBookingRequestSchenker.xml	(.../doBookingRequestSchenker.xml)	(revision 71196)
@@ -25,9 +25,10 @@
         <value>referentie</value>
       </additionalReference>
     </additionalReferences>
+    <instruction>Dostawa autem z winda</instruction>
     <pickupDate>2011-07-01</pickupDate>
     <serviceLevelTime>PREMIUM</serviceLevelTime>
-    <incoterms>DAP</incoterms>
+    <incoterms>EXW</incoterms>
     <inbound>0</inbound>
     <loadmeter>0</loadmeter>
     <noOfPackages>2</noOfPackages>