Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestVRDEuropalletenWWpallet/doBookingRequestVRD.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestVRDEuropalletenWWpallet/doBookingRequestVRD.xml	(revision 0)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestVRDEuropalletenWWpallet/doBookingRequestVRD.xml	(revision 69223)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doBooking xmlns="http://connect1.transwise.eu/TboxService/">
+  <bookingInfo>
+    <carrier>VRD</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>
+    <requestedDeliveryDate>2011-07-01</requestedDeliveryDate>
+    <serviceLevelTime>STANDARD</serviceLevelTime>
+    <inbound>0</inbound>
+    <loadmeter>0</loadmeter>
+    <noOfPackages>2</noOfPackages>
+    <shipmentLines>
+      <shipmentLine>
+        <lineNo>1</lineNo>
+        <packageType>EUROPALLET</packageType>
+        <quantity>1</quantity>
+        <measurements>
+          <length>0</length>
+          <width>0</width>
+          <height>0</height>
+          <weight>.25</weight>
+          <sizeUom>CM</sizeUom>
+          <weightUom>KG</weightUom>
+        </measurements>
+      </shipmentLine>
+      <shipmentLine>
+        <lineNo>2</lineNo>
+        <packageType>Wwpallet</packageType>
+        <quantity>1</quantity>
+        <measurements>
+          <length>0</length>
+          <width>0</width>
+          <height>0</height>
+          <weight>.25</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 -r68316 -r69223
--- vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 68316)
+++ vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 69223)
@@ -8,11 +8,17 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProjectSettingsAPI">
+<Type>vhTest.Mock.DOM.common.ProjectSettingsAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(aTestName)
 	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+	Set ..ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
 	Set ..Bouwer = ##class(APPS.TRANSP.Transsmart.impl.RequestDataBouwer).%New(##class(TECH.Context).Instance().GeefDateTimeAPI())
 ]]></Implementation>
 </Method>
@@ -47,15 +53,29 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test VRD Europallet en WW pallet">
+<Implementation><![CDATA[
+	#dim DateTimeAPI as TECH.DateTime.DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("VRDEuropallettenDoorgeven").DanReturn($$$true)
+	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoEuroEnWWPallet()
+	#dim Datum as %Date = +(DateTimeAPI.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).VRD())
+	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
+	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestVRD.xml", "")
+	Do RitMock.Verifieer()
+	do ..ProjectSettingsAPI.Verifieer()
+	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
+]]></Implementation>
+</Method>
+
 <Method name="Test doBooking Dachser met costcenter voor OPO">
 <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 ProjectSettingsAPI as vhTest.Mock.DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
-	//Do ProjectSettingsAPI.VerwachtMethodCall("IsActiefHaefeleBENaarEindklant").DanReturn($$$True)
-	Set ..Bouwer = ##class(APPS.TRANSP.Transsmart.impl.RequestDataBouwer).%New(##class(TECH.Context).Instance().GeefDateTimeAPI(), ProjectSettingsAPI)
-	
 	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoEuroPallet()
 	Set LeveringInfo.GeleverdAanKlantNummer = 30467
 	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum, 2)
@@ -67,15 +87,15 @@
 	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestDachser.xml", "")
 	
 	Do RitMock.Verifieer()
-	//Do ProjectSettingsAPI.Verifieer()
+	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
 
 <Method name="Test doBooking VRD">
 <Implementation><![CDATA[
 	#dim DateTimeAPI as TECH.DateTime.DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
-
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("VRDEuropallettenDoorgeven").DanReturn($$$false)
 	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoEuroPallet()
 	#dim Datum as %Date = +(DateTimeAPI.CurrentHorolog())	
 	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum,1)
@@ -84,13 +104,15 @@
 	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
 	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestVRD.xml", "")
 	Do RitMock.Verifieer()
+	do ..ProjectSettingsAPI.Verifieer()
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
 
 <Method name="Test doBooking VRD inclusief langgoed om wegwerppalet te kunnen aangeven">
 <Implementation><![CDATA[
 	#dim DateTimeAPI as TECH.DateTime.DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("VRDEuropallettenDoorgeven").DanReturn($$$false)
 
 	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoMixMetLanggoed()
 	#dim Datum as %Date = +(DateTimeAPI.CurrentHorolog())	
@@ -100,19 +122,19 @@
 	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
 	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestVRD.xml", "")
 	Do RitMock.Verifieer()
+	Do ..ProjectSettingsAPI.Verifieer()
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
 
 <Method name="Test doBooking VRD Met costcenter voor Haefele BE">
 <Implementation><![CDATA[
 	#dim DateTimeAPI as TECH.DateTime.DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("VRDEuropallettenDoorgeven").DanReturn($$$false)
 
-	;#dim ProjectSettingsAPI as vhTest.Mock.DOM.common.ProjectSettingsAPI = ##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI()	
-	#dim ProjectSettingsAPI as vhTest.Mock.DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
-	Do ProjectSettingsAPI.VerwachtMethodCall("IsActiefHaefeleBENaarEindklant").DanReturn($$$True)
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("IsActiefHaefeleBENaarEindklant").DanReturn($$$True)
 	
-	Set ..Bouwer = ##class(APPS.TRANSP.Transsmart.impl.RequestDataBouwer).%New(##class(TECH.Context).Instance().GeefDateTimeAPI(),ProjectSettingsAPI)
+	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 = 4875
@@ -123,19 +145,19 @@
 	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
 	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestVRD.xml", "")
 	Do RitMock.Verifieer()
-	Do ProjectSettingsAPI.Verifieer()
+	Do ..ProjectSettingsAPI.Verifieer()
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
 
 <Method name="Test doBooking VRD Met costcenter voor Van Raemdonck">
 <Implementation><![CDATA[
 	#dim DateTimeAPI as TECH.DateTime.DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("VRDEuropallettenDoorgeven").DanReturn($$$false)
 
-	#dim ProjectSettingsAPI as vhTest.Mock.DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
-	Do ProjectSettingsAPI.VerwachtMethodCall("IsActiefVanRaemdonckNaarEindklant").DanReturn($$$True)
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("IsActiefVanRaemdonckNaarEindklant").DanReturn($$$True)
 	
-	Set ..Bouwer = ##class(APPS.TRANSP.Transsmart.impl.RequestDataBouwer).%New(##class(TECH.Context).Instance().GeefDateTimeAPI(),ProjectSettingsAPI)
+	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 = 1523
@@ -146,7 +168,7 @@
 	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
 	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestVRD.xml", "")
 	Do RitMock.Verifieer()
-	Do ProjectSettingsAPI.Verifieer()
+	Do ..ProjectSettingsAPI.Verifieer()
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
@@ -171,12 +193,14 @@
 <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())	
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("VRDEuropallettenDoorgeven").DanReturn($$$false)
 	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).VRD())
 	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
 	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestVRDLeveringVolgendeWerkdag.xml", "")
 	Do RitMock.Verifieer()
+	Do ..ProjectSettingsAPI.Verifieer()
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
@@ -185,13 +209,15 @@
 <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())	
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("VRDEuropallettenDoorgeven").DanReturn($$$false)
 	
 	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum,4)
 	Set RitMock = ##class(vhTest.Mock.DOM.TRANSP.Rit).%New()
 	Do RitMock.VerwachtMethodCall("GeefTransporteur").DanReturn(##class(DOM.TRANSP.enu.Transporteur).VRD())
 	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
 	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestVRDLeveringVolgendeWerkdag.xml", "")
 	Do RitMock.Verifieer()
+	do ..ProjectSettingsAPI.Verifieer()
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
@@ -200,28 +226,31 @@
 <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())	
-	
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("VRDEuropallettenDoorgeven").DanReturn($$$false)
 	Set LeveringInfo.AfleverDatum = Datum
 	Set RitMock = ##class(vhTest.Mock.DOM.TRANSP.Rit).%New()
 	Do RitMock.VerwachtMethodCall("GeefTransporteur").DanReturn(##class(DOM.TRANSP.enu.Transporteur).VRD())
 	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
 	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestVRDLeveringVolgendeWerkdag.xml", "")
 	Do RitMock.Verifieer()
+	do ..ProjectSettingsAPI.Verifieer()
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
 
 <Method name="Test doBooking VRD Magazijn heeft achterstand">
 <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())	
+	#dim Datum as %Date = +(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog())
+	Do ..ProjectSettingsAPI.VerwachtMethodCall("VRDEuropallettenDoorgeven").DanReturn($$$false)	
 	;Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum,2)
 	Set LeveringInfo.AfleverDatum = Datum
 	Set RitMock = ##class(vhTest.Mock.DOM.TRANSP.Rit).%New()
 	Do RitMock.VerwachtMethodCall("GeefTransporteur").DanReturn(##class(DOM.TRANSP.enu.Transporteur).VRD())
 	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
 	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestVRDLeveringVolgendeWerkdag.xml", "")
 	Do RitMock.Verifieer()
+	do ..ProjectSettingsAPI.Verifieer()
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r68311 -r69223
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 68311)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 69223)
@@ -415,7 +415,13 @@
 	; mappings volgens voorstudie transsmart.
 	set Type = ##class(DOM.TRANSP.enu.VerpakkingEenheidType.AutoComplete).%New()
 	#dim PackageType as %String = ""
-	Set:VerpakkingEenheidType=Type.EuroPallet PackageType="Wwpallet"
+	if VerpakkingEenheidType= Type.EuroPallet {
+		if (Carrier = "VRD") && ..ProjectSettingsAPI.VRDEuropallettenDoorgeven() {
+			Set PackageType="EUROPALLET"
+		} else {
+			Set PackageType="Wwpallet"
+		}
+	}
 	Set:VerpakkingEenheidType=Type.WegwerpPallet PackageType="Wwpallet"
 	Set:VerpakkingEenheidType=Type.HalveEuroPallet PackageType="Pallet80x60"
 	Set:VerpakkingEenheidType=Type.BuitenmaatsPallet PackageType="Pallet"