Index: AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevKortingIterator.cls.xml
===================================================================
diff -u -r41175 -r41669
--- AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevKortingIterator.cls.xml	(.../AankoopPrijzenLevKortingIterator.cls.xml)	(revision 41175)
+++ AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevKortingIterator.cls.xml	(.../AankoopPrijzenLevKortingIterator.cls.xml)	(revision 41669)
@@ -23,6 +23,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="DynIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>QueryAPI:TECH.Query.QueryAPI="",Vestiging:%String</FormalSpec>
 <Private>1</Private>
@@ -32,8 +37,13 @@
 <Implementation><![CDATA[
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
 	Do ..VoerUitQuery()
+	
+	Set Filter = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevKortingIteratorFilter).%New()
+	Set ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
+	Set ..DynIterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator,,Filter)
 	Set ..Converter = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevKortingDixfConverter).%New(Vestiging)
 	Set ..LineNum = 0
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -43,20 +53,24 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%'"
+	// Indien nodig is hieronder een filter voorzien om het resultaat te beperken tot overzichtelijk, voor debugging:
+	/*_" and ID in (1175,1988,2865,161441,161442,254245,254258,268026,353741,353743,353744,383880,665626,668615,682391,"
+	_"709825,830257,830507,878186,878220,906194,924268,1038806,1039173,1039208,1067709,1067714,1124771,1155640,1168369,1168689,"
+	_"1168696,1169509,1194443,1247980,1259381,1359867,1425095,1425096,1432225,1572233)"*/
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
 
 <Method name="HasNext">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ( ..ResultSet.Next() > 0 )
+<Implementation><![CDATA[	Quit ..DynIterator.HasNext()
 ]]></Implementation>
 </Method>
 
 <Method name="Next">
 <ReturnType>AXdixf.AankoopPrijzenLev.AankoopPrijzenLev</ReturnType>
 <Implementation><![CDATA[
-	Set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..ResultSet.GetData(1))
+	Set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..DynIterator.Next().GetData(1))
 	Set ..LineNum = ..LineNum + 1
 	#dim ConvertedProduct As AXdixf.AankoopPrijzenLev.AankoopPrijzenLev = ..Converter.Convert(Product,..LineNum)