Index: vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml
===================================================================
diff -u -r72584 -r73465
--- vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 72584)
+++ vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 73465)
@@ -246,6 +246,28 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test doBooking Dachser met costcenter voor OPO Duitsland">
+<Implementation><![CDATA[
+	#dim DateTimeAPI as TECH.DateTime.DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
+	#dim Datum as %Date = +(DateTimeAPI.CurrentHorolog())
+	Set ..Bouwer = ##class(APPS.TRANSP.Transsmart.impl.RequestDataBouwer).%New(##class(TECH.Context).Instance().GeefDateTimeAPI())
+	
+	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoEuroPallet()
+	Set LeveringInfo.GeleverdAanKlantNummer = 39481
+	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum, 2)
+	
+	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: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r73215 -r73465
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 73215)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 73465)
@@ -281,7 +281,7 @@
 	If (Rit.GeefTransporteur() = Transporteur.Dachser){
 		if (GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.OPO)) { ; Zet de pickup datum op vandaag plus 2 werkdagen
 			Set Datum = ##class(TECH.DateTime).BerekenWerkdag(Datum, 2)
-		} else { // alle Haefeles behalve CH
+		} else { // alle Haefeles behalve CH, en OPO Duitsland
 			Set Datum = ##class(TECH.DateTime).BerekenWerkdag(Datum, 1)
 		}
 	}
@@ -496,21 +496,15 @@
 	#dim GeleverdAanKlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(LeveringInfo.GeleverdAanKlantNummer)
 	#dim CostCenter as %String = ""
 	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
-	if ##class(TECH.StringUtils).Equals(GeleverdAanKlantID,Klant.HaefeleNederland,Klant.DuPont){
+	if ##class(TECH.StringUtils).Equals(GeleverdAanKlantID,Klant.HaefeleNederland,Klant.DuPont,Klant.OPO,Klant.OPODuitsland,Klant.BlumPolen){
 		Set CostCenter = ##class(AXimpl.AdminToAxUtils).ConvertCustomerID(GeleverdAanKlantID)
 	}
 	if (GeleverdAanKlantID = Klant.HaefeleBelgie) && (..ProjectSettingsAPI.IsActiefHaefeleBENaarEindklant()) {
 		Set CostCenter = ##class(AXimpl.AdminToAxUtils).ConvertCustomerID(GeleverdAanKlantID)
 	}
-	if (GeleverdAanKlantID = Klant.OPO) {
-		Set CostCenter = ##class(AXimpl.AdminToAxUtils).ConvertCustomerID(GeleverdAanKlantID)
-	}
 	if (GeleverdAanKlantID = Klant.VanRaemdonck) && (..ProjectSettingsAPI.IsActiefVanRaemdonckNaarEindklant()) {
 		Set CostCenter = ##class(AXimpl.AdminToAxUtils).ConvertCustomerID(GeleverdAanKlantID)
 	}	
-	if (GeleverdAanKlantID = Klant.BlumPolen) {
-		Set CostCenter = ##class(AXimpl.AdminToAxUtils).ConvertCustomerID(GeleverdAanKlantID)
-	}
 	Quit CostCenter
 ]]></Implementation>
 </Method>
Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachsermetcostcentervoorOPODuitsland/doBookingRequestDachser.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachsermetcostcentervoorOPODuitsland/doBookingRequestDachser.xml	(revision 0)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDachsermetcostcentervoorOPODuitsland/doBookingRequestDachser.xml	(revision 73465)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doBooking xmlns="http://connect1.transwise.eu/TboxService/">
+  <bookingInfo>
+    <costcenter>39481</costcenter>
+    <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>39481</value>
+      </additionalReference>
+      <additionalReference>
+        <type>OTHER</type>
+        <value>referentie</value>
+      </additionalReference>
+    </additionalReferences>
+    <pickupDate>2011-07-01</pickupDate>
+    <serviceLevelTime>TARGOFLEX</serviceLevelTime>
+    <incoterms>CPT</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>
+        <contact>Een Belg</contact>
+        <telNo>Telefoon</telNo>
+        <email>leveradres@mail.com</email>
+      </address>
+    </addresses>
+  </shipmentInfo>
+</doBooking>
\ No newline at end of file