Index: DOM/AKP/impl/AankoopAPI.cls.xml
===================================================================
diff -u -r29059 -r34904
--- DOM/AKP/impl/AankoopAPI.cls.xml	(.../AankoopAPI.cls.xml)	(revision 29059)
+++ DOM/AKP/impl/AankoopAPI.cls.xml	(.../AankoopAPI.cls.xml)	(revision 34904)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="DOM.AKP.impl.AankoopAPI">
-<Super>%RegisteredObject,DOM.AKP.AankoopAPI</Super>
+<Super>TECH.RegisteredObject,DOM.AKP.AankoopAPI</Super>
 
 <Method name="GeefLeverancier">
 <FormalSpec>PartijID:DOM.common.PartijID</FormalSpec>
@@ -18,6 +18,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLeverancierIdIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.AKP.impl.DataM.DataMLeverancierIdIterator).%New()
+]]></Implementation>
+</Method>
+
 <Method name="GeefLeverancierType">
 <FormalSpec>Leverancier:DOM.AKP.Leverancier</FormalSpec>
 <ReturnType>DOM.AKP.enu.LeverancierType</ReturnType>
Index: vhTest/Mock/DOM/AKP/AankoopAPI.cls.xml
===================================================================
diff -u -r29059 -r34904
--- vhTest/Mock/DOM/AKP/AankoopAPI.cls.xml	(.../AankoopAPI.cls.xml)	(revision 29059)
+++ vhTest/Mock/DOM/AKP/AankoopAPI.cls.xml	(.../AankoopAPI.cls.xml)	(revision 34904)
@@ -3,7 +3,8 @@
 <Class name="vhTest.Mock.DOM.AKP.AankoopAPI">
 <Description>
 Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
-Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>DOM.AKP.AankoopAPI,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
@@ -12,7 +13,7 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>vhTest.Mock.DOM.AKP.AankoopAPI</ReturnType>
 <Implementation><![CDATA[
-	do ##class(DOM.DomeinContext).Instance().PushAankoopAPIClassName("vhTest.Mock.DOM.AKP.AankoopAPI")
+	do ##class(DOM.DomeinContext).Instance().PushAankoopAPIClassName(##class(vhTest.Mock.DOM.AKP.AankoopAPI).%ClassName(1))
 	quit ##class(DOM.DomeinContext).Instance().GeefAankoopAPI()
 ]]></Implementation>
 </Method>
@@ -24,6 +25,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLeverancierIdIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLeverancierIdIterator")
+]]></Implementation>
+</Method>
+
 <Method name="GeefLeverancierIterator">
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLeverancierIterator")
Index: DOM/AKP/AankoopAPI.cls.xml
===================================================================
diff -u -r29059 -r34904
--- DOM/AKP/AankoopAPI.cls.xml	(.../AankoopAPI.cls.xml)	(revision 29059)
+++ DOM/AKP/AankoopAPI.cls.xml	(.../AankoopAPI.cls.xml)	(revision 34904)
@@ -20,6 +20,11 @@
 <Abstract>1</Abstract>
 <ReturnType>TECH.Iterator</ReturnType>
 </Method>
+
+<Method name="GeefLeverancierIdIterator">
+<Abstract>1</Abstract>
+<ReturnType>TECH.Iterator</ReturnType>
+</Method>
 </Class>
 
 
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>
Index: DOM/AKP/impl/DataM/DataMLeverancierIdIterator.cls.xml
===================================================================
diff -u
--- DOM/AKP/impl/DataM/DataMLeverancierIdIterator.cls.xml	(revision 0)
+++ DOM/AKP/impl/DataM/DataMLeverancierIdIterator.cls.xml	(revision 34904)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.AKP.impl.DataM.DataMLeverancierIdIterator">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+<Inheritance>right</Inheritance>
+
+<Property name="LegacyPartijAPI">
+<Type>DOM.PARTIJ.LegacyPartijAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="GlobalIterator">
+<Type>TECH.GlobalIterator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..LegacyPartijAPI = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI()
+	Set ..GlobalIterator = ##class(TECH.GlobalIterator).%New($name(^KL1))
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..GlobalIterator.HasNext()
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[
+	do ..GlobalIterator.Next()
+	quit ..LegacyPartijAPI.GeefLeverancierPartijID(..GlobalIterator.Key())
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+<Implementation><![CDATA[	quit ..GlobalIterator.Reset()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>