Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachserVoorHaefeleNOincotermsDD4/doBookingRequestDachser.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachserVoorHaefeleNOincotermsDD4/doBookingRequestDachser.xml	(revision 0)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachserVoorHaefeleNOincotermsDD4/doBookingRequestDachser.xml	(revision 69616)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doBooking xmlns="http://connect1.transwise.eu/TboxService/">
+  <bookingInfo>
+    <carrier>DAC</carrier>
+    <origin>WEB</origin>
+    <mailType>0</mailType>
+    <language>NL</language>
+    <action>doBooking</action>
+    <version>2.0</version>
+  </bookingInfo>
+  <shipmentInfo>
+    <reference>referentie</reference>
+    <additionalReferences>
+      <additionalReference>
+        <type>DELIVERYID</type>
+        <value>12345</value>
+      </additionalReference>
+      <additionalReference>
+        <type>CUSTOMER</type>
+        <value>36605</value>
+      </additionalReference>
+      <additionalReference>
+        <type>OTHER</type>
+        <value>referentie</value>
+      </additionalReference>
+    </additionalReferences>
+    <pickupDate>2011-06-30</pickupDate>
+    <serviceLevelTime>TARGOFLEX</serviceLevelTime>
+    <incoterms>DD4</incoterms>
+    <inbound>0</inbound>
+    <loadmeter>0</loadmeter>
+    <noOfPackages>1</noOfPackages>
+    <shipmentLines>
+      <shipmentLine>
+        <lineNo>1</lineNo>
+        <packageType>WWPALLET</packageType>
+        <quantity>1</quantity>
+        <measurements>
+          <length>0</length>
+          <width>0</width>
+          <height>0</height>
+          <weight>.5</weight>
+          <sizeUom>CM</sizeUom>
+          <weightUom>KG</weightUom>
+        </measurements>
+      </shipmentLine>
+    </shipmentLines>
+    <addresses>
+      <address>
+        <type>SEND</type>
+        <name>Van Hoecke</name>
+        <street1>Europark Noord</street1>
+        <city>Sint Niklaas</city>
+        <houseNo>9</houseNo>
+        <zipCode>9100</zipCode>
+        <countryCode>BE</countryCode>
+      </address>
+      <address>
+        <type>RECV</type>
+        <name>Een Belg</name>
+        <street1>Ankerstraat 91</street1>
+        <city>Sint-Niklaas</city>
+        <zipCode>9100</zipCode>
+        <countryCode>BE</countryCode>
+        <telNo>Telefoon</telNo>
+      </address>
+    </addresses>
+  </shipmentInfo>
+</doBooking>
\ No newline at end of file
Index: vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml
===================================================================
diff -u -r69223 -r69616
--- vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 69223)
+++ vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 69616)
@@ -53,6 +53,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test doBooking Dachser Voor Haefele NO incoterms DD4">
+<Implementation><![CDATA[
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoEuroPallet()
+	#dim Datum as %Date = +(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog())	
+	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum,1)
+	Set LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.HaefeleNoorwegen)
+	Set RitMock = ##class(vhTest.Mock.DOM.TRANSP.Rit).%New()
+	Do RitMock.VerwachtMethodCall("GeefTransporteur").DanReturn(##class(DOM.TRANSP.enu.Transporteur).Dachser())
+	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
+	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestDachser.xml", "")
+	Do RitMock.Verifieer()
+	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
+]]></Implementation>
+</Method>
+
 <Method name="Test VRD Europallet en WW pallet">
 <Implementation><![CDATA[
 	#dim DateTimeAPI as TECH.DateTime.DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
Index: vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r68311 -r69616
--- vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 68311)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 69616)
@@ -16,9 +16,9 @@
 </Method>
 
 <Method name="GeefIncoterms">
-<FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
+<FormalSpec>Rit:DOM.TRANSP.Rit,LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefIncoterms",Rit)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefIncoterms",Rit,LeveringInfo)
 ]]></Implementation>
 </Method>
 
Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r69223 -r69616
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 69223)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 69616)
@@ -159,7 +159,7 @@
 	Set ShipmentInfo.pickupDate = ..BepaalPickupDate(LeveringInfo,Rit)
 	Set ShipmentInfo.noOfPackages = LeveringInfo.AantalVerpakkingEenhedenTotaal
 	Set ShipmentInfo.instruction = ..GeefInstruction(LeveringInfo)
-	Set ShipmentInfo.incoterms = ..GeefIncoterms(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")
 	}
@@ -208,13 +208,21 @@
 </Method>
 
 <Method name="GeefIncoterms">
-<FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
+<FormalSpec>Rit:DOM.TRANSP.Rit,LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	#dim Incoterms as %String = ""
 	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
-	Quit:(Rit.GeefTransporteur() = Transporteur.Dachser) "CPT"
-	Quit:(Rit.GeefTransporteur() = Transporteur.DHL) "CPT"
-	Quit ""
+	If (Rit.GeefTransporteur() = Transporteur.Dachser) {
+		If (LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.HaefeleNoorwegen) ) {
+			Set Incoterms = "DD4"
+		} else {
+			Set Incoterms = "CPT"
+		}
+	}			
+	Set:(Rit.GeefTransporteur() = Transporteur.DHL) Incoterms="CPT"
+	Quit Incoterms
 ]]></Implementation>
 </Method>