Index: AXimpl/Admin/VKP/BevestigdKlantOrderIteratorFilter.cls.xml
===================================================================
diff -u
--- AXimpl/Admin/VKP/BevestigdKlantOrderIteratorFilter.cls.xml	(revision 0)
+++ AXimpl/Admin/VKP/BevestigdKlantOrderIteratorFilter.cls.xml	(revision 44045)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Admin.VKP.BevestigdKlantOrderIteratorFilter">
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Method name="IsValid">
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit Order.IsBevestigdKlantOrder()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/impl/DataM/DataMOrderIDIterator.cls.xml
===================================================================
diff -u -r29059 -r44045
--- DOM/VKP/impl/DataM/DataMOrderIDIterator.cls.xml	(.../DataMOrderIDIterator.cls.xml)	(revision 29059)
+++ DOM/VKP/impl/DataM/DataMOrderIDIterator.cls.xml	(.../DataMOrderIDIterator.cls.xml)	(revision 44045)
@@ -6,6 +6,11 @@
 <Super>%RegisteredObject,TECH.Iterator</Super>
 <Inheritance>right</Inheritance>
 
+<Property name="HuidigOrderID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="VolgendeOrderID">
 <Type>%String</Type>
 <Private>1</Private>
@@ -16,6 +21,7 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Set ..HuidigOrderID = ""
 	Set ..VolgendeOrderID = ""
 	Do ..BepaalVolgende()
 	Quit $$$OK
@@ -31,12 +37,18 @@
 <Method name="Next">
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	#dim HuidigOrderID As %String = ..VolgendeOrderID
+	Set ..HuidigOrderID = ..VolgendeOrderID
 	Do ..BepaalVolgende()
-	Quit HuidigOrderID
+	Quit ..HuidigOrderID
 ]]></Implementation>
 </Method>
 
+<Method name="Key">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	Quit ..HuidigOrderID
+]]></Implementation>
+</Method>
+
 <Method name="BepaalVolgende">
 <Private>1</Private>
 <Implementation><![CDATA[
Index: AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml
===================================================================
diff -u
--- AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml	(revision 0)
+++ AXimpl/Admin/VKP/BevestigdKlantOrderIterator.cls.xml	(revision 44045)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Admin.VKP.BevestigdKlantOrderIterator">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="DynamicIterator">
+<Type>TECH.DynamicIterator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>OrderApi:DOM.VKP.OrderAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set OrderApi = $$$Inject(OrderApi,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
+	#dim OrderIterator As TECH.Iterator = OrderApi.GeefOrderIterator()
+	Set Filter = ##class(AXimpl.Admin.VKP.BevestigdKlantOrderIteratorFilter).%New()
+	Set ..DynamicIterator = ##class(TECH.DynamicIterator).%New(OrderIterator,,Filter)
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..DynamicIterator.HasNext()
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>DOM.VKP.Order</ReturnType>
+<Implementation><![CDATA[	Quit ..DynamicIterator.Next()
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+<Implementation><![CDATA[	Quit ..DynamicIterator.Reset()
+]]></Implementation>
+</Method>
+
+<Method name="Key">
+<Implementation><![CDATA[	Quit ..DynamicIterator.Key()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/impl/DataM/DataMOrder.cls.xml
===================================================================
diff -u -r42606 -r44045
--- DOM/VKP/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 42606)
+++ DOM/VKP/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 44045)
@@ -940,6 +940,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsBevestigdKlantOrder">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsBevestigdKlantOrder As %Boolean = $$$True
+	
+	If ((..OrderID < 101000) || (..OrderID > 199999)) {
+		Set IsBevestigdKlantOrder = $$$False
+	}
+	
+	Quit IsBevestigdKlantOrder
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DataLocation>^DOM.VKP.impl.DataM.DataMOrderD</DataLocation>
Index: vhUnitTest/AXimpl/Admin/VKP/BevestigdKlantOrderIterator/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/Admin/VKP/BevestigdKlantOrderIterator/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/Admin/VKP/BevestigdKlantOrderIterator/Test.cls.xml	(revision 44045)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.Admin.VKP.BevestigdKlantOrderIterator.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Er zijn geen orders">
+<Implementation><![CDATA[
+	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Do OrderApi.IndienMethodCall("GeefOrderIterator").DanReturn(##class(TECH.ListIterator).%New(##class(%ListOfDataTypes).%New()))
+	
+	#dim AdminOrderIterator As AXimpl.Admin.VKP.BevestigdKlantOrderIterator = ##class(AXimpl.Admin.VKP.BevestigdKlantOrderIterator).%New(OrderApi)
+	
+	Do $$$AssertFalse(AdminOrderIterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Er is enkel een standaard BevestigdKlantOrder">
+<Implementation><![CDATA[
+	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	
+	Set Order = ##class(vhTest.Utils.DOM.VKP.Order).%New().StandaardOrder()
+	Do Order.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
+	
+	Set Orders = ##class(%ListOfObjects).%New()
+	Do Orders.Insert(Order)
+	
+	Do OrderApi.IndienMethodCall("GeefOrderIterator").DanReturn(##class(TECH.ListIterator).%New(Orders))
+	
+	#dim AdminOrderIterator As AXimpl.Admin.VKP.BevestigdKlantOrderIterator = ##class(AXimpl.Admin.VKP.BevestigdKlantOrderIterator).%New(OrderApi)
+	
+	Do $$$AssertTrue(AdminOrderIterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Er is enkel een standaard NIET BevestigdKlantOrder">
+<Implementation><![CDATA[
+	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	
+	Set Order = ##class(vhTest.Utils.DOM.VKP.Order).%New().StandaardOrder()
+	Do Order.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$False)
+	
+	Set Orders = ##class(%ListOfObjects).%New()
+	Do Orders.Insert(Order)
+	
+	Do OrderApi.IndienMethodCall("GeefOrderIterator").DanReturn(##class(TECH.ListIterator).%New(Orders))
+	
+	#dim AdminOrderIterator As AXimpl.Admin.VKP.BevestigdKlantOrderIterator = ##class(AXimpl.Admin.VKP.BevestigdKlantOrderIterator).%New(OrderApi)
+	
+	Do $$$AssertFalse(AdminOrderIterator.HasNext())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/impl/DataM/DataMOrderIterator.cls.xml
===================================================================
diff -u -r29059 -r44045
--- DOM/VKP/impl/DataM/DataMOrderIterator.cls.xml	(.../DataMOrderIterator.cls.xml)	(revision 29059)
+++ DOM/VKP/impl/DataM/DataMOrderIterator.cls.xml	(.../DataMOrderIterator.cls.xml)	(revision 44045)
@@ -32,6 +32,12 @@
 <Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(..IDIterator.Next())
 ]]></Implementation>
 </Method>
+
+<Method name="Key">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	Quit ..IDIterator.Key()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/Controle/Order/Admin/AdminOrderLijnIterator/Test.cls.xml
===================================================================
diff -u -r43043 -r44045
--- vhUnitTest/AXimpl/Controle/Order/Admin/AdminOrderLijnIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 43043)
+++ vhUnitTest/AXimpl/Controle/Order/Admin/AdminOrderLijnIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 44045)
@@ -18,8 +18,11 @@
 <Implementation><![CDATA[
 	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
 	
+	Set Order = ##class(vhTest.Utils.DOM.VKP.Order).%New().StandaardOrderHoofding()
+	Do Order.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
+	
 	Set Orders = ##class(%ListOfObjects).%New()
-	Do Orders.Insert(##class(vhTest.Utils.DOM.VKP.Order).StandaardOrderHoofding())
+	Do Orders.Insert(Order)
 	
 	Do OrderApi.IndienMethodCall("GeefOrderIterator").DanReturn(##class(TECH.ListIterator).%New(Orders))
 	
@@ -33,8 +36,11 @@
 <Implementation><![CDATA[
 	#dim OrderApi As DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
 	
+	Set Order = ##class(vhTest.Utils.DOM.VKP.Order).%New().StandaardOrder()
+	Do Order.IndienMethodCall("IsBevestigdKlantOrder").DanReturn($$$True)
+	
 	Set Orders = ##class(%ListOfObjects).%New()
-	Do Orders.Insert(##class(vhTest.Utils.DOM.VKP.Order).StandaardOrder())
+	Do Orders.Insert(Order)
 	
 	Do OrderApi.IndienMethodCall("GeefOrderIterator").DanReturn(##class(TECH.ListIterator).%New(Orders))
 	
Index: AXimpl/Controle/Order/Admin/AdminOrderLijnIterator.cls.xml
===================================================================
diff -u -r43042 -r44045
--- AXimpl/Controle/Order/Admin/AdminOrderLijnIterator.cls.xml	(.../AdminOrderLijnIterator.cls.xml)	(revision 43042)
+++ AXimpl/Controle/Order/Admin/AdminOrderLijnIterator.cls.xml	(.../AdminOrderLijnIterator.cls.xml)	(revision 44045)
@@ -21,7 +21,7 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set OrderApi = $$$Inject(OrderApi,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
-	#dim OrderIterator As TECH.Iterator = OrderApi.GeefOrderIterator()
+	#dim OrderIterator As TECH.Iterator = ##class(AXimpl.Admin.VKP.BevestigdKlantOrderIterator).%New(OrderApi)
 	Set ..CombinedIterator = ##class(TECH.CombinedIterator).%New(OrderIterator,##class(AXimpl.Controle.Order.Admin.OrderLijnIterator).%ClassName($$$True))
 	Set ..Converter = $$$Inject(Converter,##class(AXimpl.Controle.Order.Admin.AdminOrderLijnConverter).%New())
 	Quit $$$OK