Index: vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r60140 -r60473
--- vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60140)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60473)
@@ -8,6 +8,13 @@
 <Super>APPS.TRANSP.Transsmart.impl.RequestDataBouwer,vhTest.Mock.APPS.TRANSP.Transsmart.RequestDataBouwer</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="%OnNew">
+<FormalSpec>DateTimeAPI:TECH.DateTime.DateTimeAPI</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefShipmentInfoGetDocs">
 <FormalSpec>Reference:%String</FormalSpec>
 <ReturnType>WS.Transsmart.tns.GetDocsShipmentInfo</ReturnType>
@@ -31,7 +38,7 @@
 
 <Method name="MaakgetDocsRequest">
 <FormalSpec>Reference:%String</FormalSpec>
-<ReturnType>WS.Transsmart.tns.doDelete</ReturnType>
+<ReturnType>WS.Transsmart.tns.getDocs</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakgetDocsRequest",Reference)
 ]]></Implementation>
 </Method>
Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDHL/doBookingRequestDHL.xml
===================================================================
diff -u -r60459 -r60473
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDHL/doBookingRequestDHL.xml	(.../doBookingRequestDHL.xml)	(revision 60459)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingDHL/doBookingRequestDHL.xml	(.../doBookingRequestDHL.xml)	(revision 60473)
@@ -24,7 +24,7 @@
         <value>referentie</value>
       </additionalReference>
     </additionalReferences>
-    <pickupDate>2020-03-27</pickupDate>
+    <pickupDate>2011-06-30</pickupDate>
     <serviceLevelTime>EUROPLUS</serviceLevelTime>
     <inbound>0</inbound>
     <loadmeter>0</loadmeter>
Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingVRDMagazijnwerktopvoorhand/doBookingRequestVRDLeveringVolgendeWerkdag.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingVRDMagazijnwerktopvoorhand/doBookingRequestVRDLeveringVolgendeWerkdag.xml	(revision 0)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingVRDMagazijnwerktopvoorhand/doBookingRequestVRDLeveringVolgendeWerkdag.xml	(revision 60473)
@@ -0,0 +1,67 @@
+<?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-07-01</pickupDate>
+    <serviceLevelTime>STANDARD</serviceLevelTime>
+    <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 -r60141 -r60473
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60141)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60473)
@@ -3,6 +3,23 @@
 <Class name="APPS.TRANSP.Transsmart.impl.RequestDataBouwer">
 <Super>APPS.TRANSP.Transsmart.RequestDataBouwer,TECH.Mockable</Super>
 
+<Property name="DateTimeAPI">
+<Type>TECH.DateTime.DateTimeAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>DateTimeAPI:TECH.DateTime.DateTimeAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..DateTimeAPI = $$$Inject(DateTimeAPI,##class(TECH.Context).Instance().GeefDateTimeAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="MaakdoBookingRequest">
 <FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit</FormalSpec>
 <ReturnType>WS.Transsmart.tns.doBooking</ReturnType>
@@ -32,7 +49,7 @@
 
 <Method name="MaakgetDocsRequest">
 <FormalSpec>Reference:%String</FormalSpec>
-<ReturnType>WS.Transsmart.tns.doDelete</ReturnType>
+<ReturnType>WS.Transsmart.tns.getDocs</ReturnType>
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Transsmart.tns.getDocs).%New()
 	Set Request.shipmentInfo = ..GeefShipmentInfoGetDocs(Reference)
@@ -148,11 +165,12 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	; als de afleverdatum niet de volgende werkdag is, zet dan de pickupdatum op de volgende werkdag
-	#dim Datum as %Date
-	if $$$Not(##class(TECH.DateTime).BerekenWerkdag(+$H,1) = LeveringInfo.AfleverDatum) {
-		Set Datum = ##class(TECH.DateTime).BerekenWerkdag(+$H,1)
-	} else {
-		Set Datum = +$H
+	Do ##class(Tools.Wlip).%New(207).String(..DateTimeAPI)
+	#dim Datum as %Date = +(..DateTimeAPI.CurrentHorolog())
+	
+	if $$$Not(##class(TECH.DateTime).BerekenWerkdag(Datum,1) = LeveringInfo.AfleverDatum) {
+		Set Datum = ##class(TECH.DateTime).BerekenWerkdag(Datum,1)
+		Do ##class(Tools.Wlip).%New(207).String(Datum)
 	}
 	Quit ##class(TECH.Format.impl.FormatAPI).%New().FormatHorolog(Datum,"JJJJ-MM-DD")
 ]]></Implementation>
Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingVRD/doBookingRequestVRD.xml
===================================================================
diff -u -r60459 -r60473
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingVRD/doBookingRequestVRD.xml	(.../doBookingRequestVRD.xml)	(revision 60459)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingVRD/doBookingRequestVRD.xml	(.../doBookingRequestVRD.xml)	(revision 60473)
@@ -24,7 +24,7 @@
         <value>referentie</value>
       </additionalReference>
     </additionalReferences>
-    <pickupDate>2020-03-27</pickupDate>
+    <pickupDate>2011-06-30</pickupDate>
     <serviceLevelTime>STANDARD</serviceLevelTime>
     <inbound>0</inbound>
     <loadmeter>0</loadmeter>
Index: vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml
===================================================================
diff -u -r60459 -r60473
--- vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 60459)
+++ vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 60473)
@@ -11,13 +11,19 @@
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
 	Do ##super()
-	Set ..Bouwer = ##class(APPS.TRANSP.Transsmart.impl.RequestDataBouwer).%New()
+	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+	Set ..Bouwer = ##class(APPS.TRANSP.Transsmart.impl.RequestDataBouwer).%New(##class(TECH.Context).Instance().GeefDateTimeAPI())
 ]]></Implementation>
 </Method>
 
 <Method name="Test doBooking DHL">
 <Implementation><![CDATA[
+	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+
 	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoColli()
+	#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).DHL())
 	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
@@ -29,7 +35,12 @@
 
 <Method name="Test doBooking VRD">
 <Implementation><![CDATA[
+	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+	#dim DateTimeAPI as TECH.DateTime.DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
+	Do ##class(Tools.Wlip).%New(207).String(DateTimeAPI)
 	#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)
 	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)
@@ -39,6 +50,23 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test doBooking VRD Magazijn werkt op voorhand">
+<Implementation><![CDATA[
+	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+	Do ##class(Tools.Wlip).%New(207).String(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog())
+	Do ##class(Tools.Wlip).%New(207).String(##class(TECH.DateTime).GeefDatumInPuntNotatie(+(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog())))
+	#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,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 $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
+]]></Implementation>
+</Method>
+
 <Method name="Test doDelete">
 <Implementation><![CDATA[
 	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoDeleteRequest(..GeefVerzendDataVoorAnnulatie()), "doDeleteRequest.xml", "")
Index: vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml
===================================================================
diff -u -r60393 -r60473
--- vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60393)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60473)
@@ -7,27 +7,6 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.TRANSP.Transsmart.RequestDataBouwer,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
-
-<Method name="MaakdoBookingRequest">
-<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit</FormalSpec>
-<ReturnType>WS.Transsmart.tns.doBooking</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakdoBookingRequest",LeveringInfo,Rit)
-]]></Implementation>
-</Method>
-
-<Method name="MaakdoDeleteRequest">
-<FormalSpec>VerzendData:APPS.TRANSP.Transsmart.data.VerzendData</FormalSpec>
-<ReturnType>WS.Transsmart.tns.doDelete</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakdoDeleteRequest",VerzendData)
-]]></Implementation>
-</Method>
-
-<Method name="MaakgetDocsRequest">
-<FormalSpec>Reference:%String</FormalSpec>
-<ReturnType>WS.Transsmart.tns.doDelete</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakgetDocsRequest",Reference)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml
===================================================================
diff -u -r60393 -r60473
--- APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60393)
+++ APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60473)
@@ -19,7 +19,7 @@
 <Method name="MaakgetDocsRequest">
 <Abstract>1</Abstract>
 <FormalSpec>Reference:%String</FormalSpec>
-<ReturnType>WS.Transsmart.tns.doDelete</ReturnType>
+<ReturnType>WS.Transsmart.tns.getDocs</ReturnType>
 </Method>
 
 <UDLText name="T">
Index: vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r60140 -r60473
--- vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60140)
+++ vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60473)
@@ -30,7 +30,7 @@
 
 <Method name="MaakgetDocsRequest">
 <FormalSpec>Reference:%String</FormalSpec>
-<ReturnType>WS.Transsmart.tns.doDelete</ReturnType>
+<ReturnType>WS.Transsmart.tns.getDocs</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>