Index: AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml
===================================================================
diff -u -r42532 -r42616
--- AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml	(.../AankoopPrijzenLevIterator.cls.xml)	(revision 42532)
+++ AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml	(.../AankoopPrijzenLevIterator.cls.xml)	(revision 42616)
@@ -3,6 +3,11 @@
 <Class name="AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevIterator">
 <Super>TECH.RegisteredObject,TECH.Iterator</Super>
 
+<Property name="DynIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="QueryAPI">
 <Type>TECH.Query.QueryAPI</Type>
 <Private>1</Private>
@@ -32,6 +37,9 @@
 <Implementation><![CDATA[
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
 	Do ..VoerUitQuery()
+	Set Filter = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevIteratorFilter).%New()
+	Set ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
+	Set ..DynIterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator,,Filter)
 	Set ..Converter = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter).%New(Vestiging)
 	Set ..LineNum = 0
 	Quit $$$OK
@@ -49,14 +57,14 @@
 
 <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)