Index: APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml
===================================================================
diff -u -r53230 -r54659
--- APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 53230)
+++ APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 54659)
@@ -131,6 +131,42 @@
 	Quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="GeefVorigeDeliveryDate">
+<FormalSpec>PickupDate:%Date,DeliveryDate:%Date,OrderDate:%Date</FormalSpec>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[
+	#dim Params As %List = $LB(PickupDate, DeliveryDate, OrderDate)
+	#dim Filter As %String = "PickupDate >= ? and DeliveryDate <= ? and OrderDate >= ?"
+	#dim SqlTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..#DataClassName)
+	#dim SqlStatement As TECH.String = "SELECT Max(DeliveryDate) As VorigePickupDate FROM " _SqlTableName _" WHERE " _Filter
+
+	Set DynamicQuery = ##class(TECH.DynamicQuery).%New(SqlStatement,Params)
+	Set DynamicQuery.RuntimeMode = ##class(TECH.enu.ResultSetRuntimeMode).Logical()
+	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(DynamicQuery)
+	
+	Quit:ResultSet.Next() ResultSet.Get("VorigePickupDate")
+	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GeefVolgendeDeliveryDate">
+<FormalSpec>PickupDate:%Date,DeliveryDate:%Date,OrderDate:%Date</FormalSpec>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[
+	#dim Params As %List = $LB(PickupDate, DeliveryDate, OrderDate)
+	#dim Filter As %String = "PickupDate >= ? and DeliveryDate >= ? and OrderDate >= ?"
+	#dim SqlTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..#DataClassName)
+	#dim SqlStatement As TECH.String = "SELECT Min(DeliveryDate) As VolgendePickupDate FROM " _SqlTableName _" WHERE " _Filter
+
+	Set DynamicQuery = ##class(TECH.DynamicQuery).%New(SqlStatement,Params)
+	Set DynamicQuery.RuntimeMode = ##class(TECH.enu.ResultSetRuntimeMode).Logical()
+	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(DynamicQuery)
+	
+	Quit:ResultSet.Next() ResultSet.Get("VolgendePickupDate")
+	Quit ""
+]]></Implementation>
+</Method>
 </Class>