Index: vhTest/Mock/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml
===================================================================
diff -u -r52956 -r53017
--- vhTest/Mock/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 52956)
+++ vhTest/Mock/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 53017)
@@ -88,16 +88,16 @@
 </Method>
 
 <Method name="ZoekViaOrderDate">
-<FormalSpec>OrderDate:%Date,UntilDate:%Date</FormalSpec>
+<FormalSpec>OrderDate:%Date,UntilOrderDate:%Date</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaOrderDate",OrderDate,UntilDate)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaOrderDate",OrderDate,UntilOrderDate)
 ]]></Implementation>
 </Method>
 
 <Method name="ZoekViaPickupDate">
-<FormalSpec>PickupDate:%Date</FormalSpec>
+<FormalSpec>PickupDate:%Date,UntilPickupDate:%Date</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaPickupDate",PickupDate)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekViaPickupDate",PickupDate,UntilPickupDate)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Fake/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml
===================================================================
diff -u -r52956 -r53017
--- vhTest/Fake/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 52956)
+++ vhTest/Fake/APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 53017)
@@ -87,14 +87,14 @@
 </Method>
 
 <Method name="ZoekViaOrderDate">
-<FormalSpec>OrderDate:%Date,UntilDate:%Date</FormalSpec>
+<FormalSpec>OrderDate:%Date,UntilOrderDate:%Date</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
 <Method name="ZoekViaPickupDate">
-<FormalSpec>PickupDate:%Date</FormalSpec>
+<FormalSpec>PickupDate:%Date,UntilPickupDate:%Date</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
Index: APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml
===================================================================
diff -u -r52956 -r53017
--- APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 52956)
+++ APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 53017)
@@ -30,9 +30,9 @@
 </Method>
 
 <Method name="ZoekViaOrderDate">
-<FormalSpec>OrderDate:%Date,UntilDate:%Date</FormalSpec>
+<FormalSpec>OrderDate:%Date,UntilOrderDate:%Date</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..ZoekViaFilter("OrderDate => ? and OrderDate <= ?", $LB(OrderDate, UntilDate))
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("OrderDate => ? and OrderDate <= ?", $LB(OrderDate, UntilOrderDate))
 ]]></Implementation>
 </Method>
 
@@ -44,9 +44,9 @@
 </Method>
 
 <Method name="ZoekViaPickupDate">
-<FormalSpec>PickupDate:%Date</FormalSpec>
+<FormalSpec>PickupDate:%Date,UntilPickupDate:%Date</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefViaFilter("PickupDate = ?", $LB(PickupDate))
+<Implementation><![CDATA[	Quit ..GeefViaFilter("PickupDate => ? and PickupDate <= ?", $LB(PickupDate, UntilPickupDate))
 ]]></Implementation>
 </Method>
 </Class>