Index: APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml
===================================================================
diff -u -r53017 -r53064
--- APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 53017)
+++ APPS/EC/impl/LeverdatumBepaler/Data/SFSKalenderRepository.cls.xml	(.../SFSKalenderRepository.cls.xml)	(revision 53064)
@@ -32,7 +32,7 @@
 <Method name="ZoekViaOrderDate">
 <FormalSpec>OrderDate:%Date,UntilOrderDate:%Date</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..ZoekViaFilter("OrderDate => ? and OrderDate <= ?", $LB(OrderDate, UntilOrderDate))
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("OrderDate >= ? and OrderDate <= ?", $LB(OrderDate, UntilOrderDate))
 ]]></Implementation>
 </Method>
 
@@ -46,9 +46,48 @@
 <Method name="ZoekViaPickupDate">
 <FormalSpec>PickupDate:%Date,UntilPickupDate:%Date</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefViaFilter("PickupDate => ? and PickupDate <= ?", $LB(PickupDate, UntilPickupDate))
+<Implementation><![CDATA[	Quit ..ZoekViaFilter("PickupDate >= ? and PickupDate <= ?", $LB(PickupDate, UntilPickupDate))
 ]]></Implementation>
 </Method>
+
+<Method name="ZoekViaFilter">
+<FormalSpec>Filter:%String,Params:%List</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim SqlTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..#DataClassName)
+	#dim SqlStatement As TECH.String = "SELECT ID 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)
+	
+	#dim Opener As TECH.Persistentie.Repository.ResultSetItemOpener = ##class(TECH.Persistentie.Repository.ResultSetItemOpener).%New($this)
+	#dim ResultSetIterator As TECH.Iterator = ##class(TECH.ResultSetIterator).%New(ResultSet)
+	#dim Result As TECH.Iterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator, Opener)
+
+	quit Result
+]]></Implementation>
+</Method>
+
+<Method name="BestaatViaFilter">
+<FormalSpec>Filter:%String,Params:%List</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim SqlTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..#DataClassName)
+	#dim SqlStatement As TECH.String = "SELECT ID 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() 1
+	Quit 0
+]]></Implementation>
+</Method>
 </Class>