Index: WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml
===================================================================
diff -u -r48579 -r48772
--- WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml	(.../KlantDocumentService.cls.xml)	(revision 48579)
+++ WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml	(.../KlantDocumentService.cls.xml)	(revision 48772)
@@ -47,6 +47,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OrderBeperker">
+<Type>WSimpl.Vhisie4.OrderBeperker</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
@@ -57,6 +62,7 @@
 	Set ..SessionManager = ##class(WSimpl.Vhisie4.SessionManager).%New()
 	Set ..KlantIdConverter = ##class(WSimpl.Vhisie4.KlantIdConverter).%New()
 	Set ..ProductIdConverter = ##class(WSimpl.Vhisie4.ProductIdConverter).%New()
+	Set ..OrderBeperker = ##class(WSimpl.Vhisie4.OrderBeperker).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -123,6 +129,7 @@
 	Set:..#RunAX Response = ##class(AX.Uitgaand.EC.DataAX.impl.OrdersOphalen).%New(Request).GeefResponse()
 	
 	Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response.KlantId)
+	Set Response.Lijst = ..OrderBeperker.GeefBeperkteLijst(Response.Lijst, ##class(WSimpl.Vhisie4.OrderBeperker.Filter).%New())
 	
 	#dim HoofdingIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Response.Lijst)
 	
Index: vhUnitTest/WSimpl/Vhisie4/OrderBeperker/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Vhisie4/OrderBeperker/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Vhisie4/OrderBeperker/Test.cls.xml	(revision 48772)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Vhisie4.OrderBeperker.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: OrderBeperker beperkt lijst via Filter">
+<Implementation><![CDATA[
+	#dim Lijst As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Item1", "Item2", "Item3")
+	
+	#dim FilterMock As vhTest.Mock.TECH.Filter = ##class(vhTest.Mock.TECH.Filter).%New()
+	Do FilterMock.VerwachtMethodCall("IsValid", Lijst.GetAt(1)).DanReturn($$$True)
+	Do FilterMock.VerwachtMethodCall("IsValid", Lijst.GetAt(2)).DanReturn($$$True)
+	Do FilterMock.VerwachtMethodCall("IsValid", Lijst.GetAt(3)).DanReturn($$$False)
+	
+	#dim OrderBeperker As WSimpl.Vhisie4.OrderBeperker = ##class(WSimpl.Vhisie4.OrderBeperker).%New()
+	#dim BeperkteLijst As %ListOfDataTypes = OrderBeperker.GeefBeperkteLijst(Lijst, FilterMock)
+	
+	Do $$$AssertInList(BeperkteLijst, Lijst.GetAt(1))
+	Do $$$AssertInList(BeperkteLijst, Lijst.GetAt(2))
+	Do $$$AssertNotInList(BeperkteLijst, Lijst.GetAt(3))
+	
+	Do FilterMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Vhisie4/OrderBeperker/Iterator.cls.xml
===================================================================
diff -u
--- WSimpl/Vhisie4/OrderBeperker/Iterator.cls.xml	(revision 0)
+++ WSimpl/Vhisie4/OrderBeperker/Iterator.cls.xml	(revision 48772)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Vhisie4.OrderBeperker.Iterator">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="DynamicIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Filter">
+<Type>TECH.Filter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderHoofdingen">
+<Type>%ListOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>OrderHoofdingen:%ListOfDataTypes(ELEMENTTYPE="WS.Vhisie4.KlantDocument.dto.OrderHoofding"),Filter:TECH.Filter=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..OrderHoofdingen = OrderHoofdingen
+	Set ..Filter = Filter
+	
+	Do ..Reset()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..DynamicIterator.HasNext()
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	Quit ..DynamicIterator.Next()
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+<Implementation><![CDATA[
+	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(..OrderHoofdingen)
+	
+	Set ..DynamicIterator = ##class(TECH.DynamicIterator).%New(Iterator,, ..Filter)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Vhisie4/OrderBeperker.cls.xml
===================================================================
diff -u
--- WSimpl/Vhisie4/OrderBeperker.cls.xml	(revision 0)
+++ WSimpl/Vhisie4/OrderBeperker.cls.xml	(revision 48772)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Vhisie4.OrderBeperker">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="GeefBeperkteLijst">
+<FormalSpec>OrderHoofdingen:%ListOfDataTypes(ELEMENTTYPE="WS.Vhisie4.KlantDocument.dto.OrderHoofding"),Filter:TECH.Filter</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<ReturnTypeParams>ELEMENTTYPE="WS.Vhisie4.KlantDocument.dto.OrderHoofding"</ReturnTypeParams>
+<Implementation><![CDATA[
+	#dim BeperkteLijst As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#dim OrderIterator As WSimpl.Vhisie4.OrderBeperker.Iterator = ##class(WSimpl.Vhisie4.OrderBeperker.Iterator).%New(OrderHoofdingen, Filter)
+	
+	While OrderIterator.HasNext() {
+		Do BeperkteLijst.Insert(OrderIterator.Next())
+	}
+	
+	Quit BeperkteLijst
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhDeploy/Deploy20171227xTijdelijkeOrders2A.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20171227xTijdelijkeOrders2A.cls.xml	(revision 0)
+++ vhDeploy/Deploy20171227xTijdelijkeOrders2A.cls.xml	(revision 48772)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20171227xTijdelijkeOrders2A">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Configitem 2A voor afhandeling tijdelijke Orders</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	#dim Sleutel As %String = "TijdelijkeOrders2A"
+	
+	If ($$$Not(##class(TECH.Config.ConfigMgr).Instance().BestaatSleutel(Sleutel))) {
+		Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean(Sleutel, $$$True)
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Vhisie4/OrderBeperker/Filter.cls.xml
===================================================================
diff -u
--- WSimpl/Vhisie4/OrderBeperker/Filter.cls.xml	(revision 0)
+++ WSimpl/Vhisie4/OrderBeperker/Filter.cls.xml	(revision 48772)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Vhisie4.OrderBeperker.Filter">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="IsValid">
+<FormalSpec>Value:%CacheString</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..IsModus2A() && $$$Not(..IsTijdelijkOrder(Value)))
+]]></Implementation>
+</Method>
+
+<Method name="IsModus2A">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("TijdelijkeOrders2A")
+]]></Implementation>
+</Method>
+
+<Method name="IsTijdelijkOrder">
+<FormalSpec>OrderHoofding:WS.Vhisie4.KlantDocument.dto.OrderHoofding</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (OrderHoofding.OrderId < 110000)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>