Index: AXimpl/Controle/Order/AdminOrderIterator.cls.xml
===================================================================
diff -u -r42970 -r42984
--- AXimpl/Controle/Order/AdminOrderIterator.cls.xml	(.../AdminOrderIterator.cls.xml)	(revision 42970)
+++ AXimpl/Controle/Order/AdminOrderIterator.cls.xml	(.../AdminOrderIterator.cls.xml)	(revision 42984)
@@ -3,31 +3,11 @@
 <Class name="AXimpl.Controle.Order.AdminOrderIterator">
 <Super>TECH.RegisteredObject,TECH.Iterator</Super>
 
-<Property name="ConvertedAdminProductOrderLijn">
-<Type>AXimpl.Controle.Order.OrderLijn</Type>
+<Property name="CombinedIterator">
+<Type>TECH.CombinedIterator</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="Orderlijn">
-<Type>DOM.VKP.impl.DataM.DataMOrderlijn</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="OrderApi">
-<Type>DOM.VKP.OrderAPI</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="OrderIterator">
-<Type>TECH.Iterator</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="OrderlijnIterator">
-<Type>TECH.Iterator</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="Converter">
 <Type>AXimpl.Controle.Order.AdminOrderConverter</Type>
 <Private>1</Private>
@@ -40,48 +20,28 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..OrderApi = $$$Inject(OrderApi,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
-	Set ..OrderIterator = ..OrderApi.GeefOrderIterator()
+	Set OrderApi = $$$Inject(OrderApi,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
+	#dim OrderIterator As TECH.Iterator = OrderApi.GeefOrderIterator()
+	Set ..CombinedIterator = ##class(TECH.CombinedIterator).%New(OrderIterator,"AXimpl.Controle.Order.OrderLijnIterator")
 	Set ..Converter = ##class(AXimpl.Controle.Order.AdminOrderConverter).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="HasNext">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ( ..OrderIterator.Next() > 0 )
+<Implementation><![CDATA[	Quit ..CombinedIterator.HasNext()
 ]]></Implementation>
 </Method>
 
 <Method name="Next">
 <ReturnType>AXimpl.Controle.Order.OrderLijn</ReturnType>
 <Implementation><![CDATA[
-	Set ..OrderlijnIterator = ..OrderIterator.Next().GeefTypeOrderLijnIterator(##class(DOM.VKP.enu.OrderLijnType).Product())
-	While (..HasNextOrderlijn()) {
-		Do ..Converteer()
-	}
+	#dim ConvertedAdminProductOrderLijn As AXimpl.Controle.Order.OrderLijn = ..Converter.Convert(..CombinedIterator.Next())
 	
-	Quit ..ConvertedAdminProductOrderLijn
+	Quit ConvertedAdminProductOrderLijn
 ]]></Implementation>
 </Method>
-
-<Method name="HasNextOrderlijn">
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	Set ..Orderlijn = ..OrderlijnIterator.Next()
-	Quit ( ..Orderlijn > 0 )
-]]></Implementation>
-</Method>
-
-<Method name="Converteer">
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim AdminProductOrderLijn As DOM.VKP.impl.DataM.DataMProductOrderlijn = ..Orderlijn
-	Set ..ConvertedAdminProductOrderLijn = ..Converter.Convert(AdminProductOrderLijn)
-	Quit
-]]></Implementation>
-</Method>
 </Class>