Index: DOM/AKP/impl/DataM/DataMLeverancierIterator.cls.xml
===================================================================
diff -u -r29059 -r34904
--- DOM/AKP/impl/DataM/DataMLeverancierIterator.cls.xml	(.../DataMLeverancierIterator.cls.xml)	(revision 29059)
+++ DOM/AKP/impl/DataM/DataMLeverancierIterator.cls.xml	(.../DataMLeverancierIterator.cls.xml)	(revision 34904)
@@ -3,13 +3,12 @@
 <Class name="DOM.AKP.impl.DataM.DataMLeverancierIterator">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,TECH.Iterator</Super>
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
 <Inheritance>right</Inheritance>
 
-<Property name="LeverancierNummer">
-<Type>%String</Type>
+<Property name="LeverancierIdIterator">
+<Type>DOM.AKP.impl.DataM.DataMLeverancierIdIterator</Type>
 <Private>1</Private>
-<Parameter name="TRUNCATE" value="1"/>
 </Property>
 
 <Property name="AankoopAPI">
@@ -22,38 +21,26 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..LeverancierNummer = ""
 	Set ..AankoopAPI = ##class(DOM.DomeinContext).Instance().GeefAankoopAPI()
-	Do ..BepaalVolgende()
+	set ..LeverancierIdIterator = ##class(DOM.AKP.impl.DataM.DataMLeverancierIdIterator).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="HasNext">
-<Description>
-Returns true if the iteration has more elements.</Description>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..LeverancierNummer '= ""
+<Implementation><![CDATA[	quit ..LeverancierIdIterator.HasNext()
 ]]></Implementation>
 </Method>
 
 <Method name="Next">
-<Description>
-Returns the next element in the iteration.
-Only returns a valid element if HasNext() returns true
-Causes an error if HasNext() returns false</Description>
 <ReturnType>%CacheString</ReturnType>
-<Implementation><![CDATA[
-	#dim PartijID As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefLeverancierPartijID(..LeverancierNummer)
-	#dim Leverancier As %String = ..AankoopAPI.GeefLeverancier(PartijID)
-	Do ..BepaalVolgende()
-	Quit Leverancier
+<Implementation><![CDATA[	quit ..AankoopAPI.GeefLeverancier(..LeverancierIdIterator.Next())
 ]]></Implementation>
 </Method>
 
-<Method name="BepaalVolgende">
-<Private>1</Private>
-<Implementation><![CDATA[	Set ..LeverancierNummer = $Order(^KL1(..LeverancierNummer))
+<Method name="Reset">
+<Implementation><![CDATA[	quit ..LeverancierIdIterator.Reset()
 ]]></Implementation>
 </Method>
 </Class>