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>