Index: vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml
===================================================================
diff -u -r62870 -r63818
--- vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 62870)
+++ vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 63818)
@@ -32,6 +32,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test doBooking Dachser">
+<Implementation><![CDATA[
+	#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 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 doBooking VRD">
 <Implementation><![CDATA[
 	#dim DateTimeAPI as TECH.DateTime.DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachser/doBookingRequestDachser.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachser/doBookingRequestDachser.xml	(revision 0)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachser/doBookingRequestDachser.xml	(revision 63818)
@@ -0,0 +1,68 @@
+<?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>1000</value>
+      </additionalReference>
+      <additionalReference>
+        <type>OTHER</type>
+        <value>referentie</value>
+      </additionalReference>
+    </additionalReferences>
+    <pickupDate>2011-06-30</pickupDate>
+    <serviceLevelTime>TARGOFLEX</serviceLevelTime>
+    <incoterms>EXW</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>
+      </address>
+    </addresses>
+  </shipmentInfo>
+</doBooking>
\ No newline at end of file
Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r62836 -r63818
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 62836)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 63818)
@@ -141,7 +141,7 @@
 	Set ShipmentInfo.pickupDate = ..BepaalPickupDate(LeveringInfo,Rit)
 	Set ShipmentInfo.noOfPackages = LeveringInfo.AantalVerpakkingEenhedenTotaal
 	Set ShipmentInfo.instruction = ..GeefInstruction(LeveringInfo)
-	
+	Set ShipmentInfo.incoterms = ..GeefIncoterms(Rit)
 	try {
 		#dim GewichtPerEenheid as %Numeric = ##class(TECH.Math).Round(LeveringInfo.Gewicht / LeveringInfo.AantalVerpakkingEenhedenTotaal,2)
 	} catch {
@@ -150,11 +150,12 @@
 	}
 	set it = ##class(TECH.ListIterator).%New(LeveringInfo.VerpakkingEenheden)
 	#dim Linecounter as %Integer = 0
+	#dim Carrier as %String = ..BepaalBookingInfoCarrier(Rit)
 	While (it.HasNext()){
 		Set Linecounter = Linecounter+ 1
 		#dim VerpakkingEenheid as APPS.TRANSP.dto.VerpakkingEenheid = it.Next()
 		
-		Do ShipmentInfo.shipmentLines.Insert(..GeefShipmentLine(Linecounter,VerpakkingEenheid,GewichtPerEenheid))
+		Do ShipmentInfo.shipmentLines.Insert(..GeefShipmentLine(Linecounter,VerpakkingEenheid,GewichtPerEenheid,Carrier))
 	}
 	
 	Do ShipmentInfo.addresses.Insert(..GeefAfzenderAdres(LeveringInfo))
@@ -169,6 +170,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefIncoterms">
+<FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
+	Quit:(Rit.GeefTransporteur() = Transporteur.Dachser) "EXW"
+	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="BepaalPickupDate">
 <FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit</FormalSpec>
 <Private>1</Private>
@@ -298,13 +309,13 @@
 </Method>
 
 <Method name="GeefShipmentLine">
-<FormalSpec>Lijnnummmer:%Integer,VerpakkingEenheid:APPS.TRANSP.dto.VerpakkingEenheid,Gewicht:%Numeric</FormalSpec>
+<FormalSpec>Lijnnummmer:%Integer,VerpakkingEenheid:APPS.TRANSP.dto.VerpakkingEenheid,Gewicht:%Numeric,Carrier:%String=""</FormalSpec>
 <Private>1</Private>
 <ReturnType>WS.Transsmart.tns.DoBookingShipmentLine</ReturnType>
 <Implementation><![CDATA[
 	Set ShipmentLine = ##class(WS.Transsmart.tns.DoBookingShipmentLine).%New()
 	Set ShipmentLine.lineNo = Lijnnummmer
-	Set ShipmentLine.packageType = ..BepaalPackageType(VerpakkingEenheid.Type)
+	Set ShipmentLine.packageType = ..BepaalPackageType(VerpakkingEenheid.Type,Carrier)
 	Set ShipmentLine.quantity = VerpakkingEenheid.Aantal
 	Set ShipmentLine.measurements = ##class(WS.Transsmart.tns.DoBookingMeasurements).%New()
 	Set ShipmentLine.measurements.length = 0
@@ -337,21 +348,40 @@
 </Method>
 
 <Method name="BepaalPackageType">
-<FormalSpec>VerpakkingEenheidType:DOM.TRANSP.enu.VerpakkingEenheidType</FormalSpec>
+<FormalSpec>VerpakkingEenheidType:DOM.TRANSP.enu.VerpakkingEenheidType,Carrier:%String=""</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	; mappings volgens voorstudie transsmart.
 	set Type = ##class(DOM.TRANSP.enu.VerpakkingEenheidType.AutoComplete).%New()
-	Quit:VerpakkingEenheidType=Type.Colli "BOX"
-	Quit:VerpakkingEenheidType=Type.EuroPallet "Wwpallet"
-	Quit:VerpakkingEenheidType=Type.HalveEuroPallet "Pallet80x60"
-	Quit:VerpakkingEenheidType=Type.BuitenmaatsPallet "Pallet"
-	Quit:VerpakkingEenheidType=Type.Langgoed "Bundel"
-	; Quit:VerpakkingEenheidType=Type.     -->> Wegwerppallet????
+	#dim PackageType as %String = ""
+	Set:VerpakkingEenheidType=Type.EuroPallet PackageType="Wwpallet"
+	Set:VerpakkingEenheidType=Type.HalveEuroPallet PackageType="Pallet80x60"
+	Set:VerpakkingEenheidType=Type.BuitenmaatsPallet PackageType="Pallet"
+
+	Set:VerpakkingEenheidType=Type.Colli PackageType="BOX"
+	Set:VerpakkingEenheidType=Type.Langgoed PackageType="Bundel"
+	; Set:VerpakkingEenheidType=Type.     -->> Wegwerppallet????
+	if Carrier = "DAC" {
+		if (VerpakkingEenheidType = Type.Colli) || (VerpakkingEenheidType = Type.Langgoed){
+		}
+		Set PackageType = ##class(TECH.StringUtils).ToUpper(PackageType)
+	}
+	Quit PackageType
 ]]></Implementation>
 </Method>
 
+<Method name="ValideerVerpakkingTypeGeldigVoorCarrier">
+<FormalSpec>VerpakkingEenheidType:DOM.TRANSP.enu.VerpakkingEenheidType,Carrier:%String=""</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set Type = ##class(DOM.TRANSP.enu.VerpakkingEenheidType.AutoComplete).%New()
+	if (Carrier = "DAC") && ((VerpakkingEenheidType = Type.Colli) || (VerpakkingEenheidType = Type.Langgoed)){
+		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Verpakkingtype "_ VerpakkingEenheidType_ " niet toegelaten voor carrier " _ Carrier)
+	}
+]]></Implementation>
+</Method>
+
 <Method name="BepaalBookingInfoCarrier">
 <FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
 <Private>1</Private>
@@ -361,6 +391,7 @@
 	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 ""
 ]]></Implementation>
 </Method>
@@ -375,6 +406,7 @@
 	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 ""
 ]]></Implementation>
 </Method>