Index: AXimpl/Dynamics/InventoryOut/MaatwerkIteratorFilter.cls.xml
===================================================================
diff -u -r49092 -r55463
--- AXimpl/Dynamics/InventoryOut/MaatwerkIteratorFilter.cls.xml	(.../MaatwerkIteratorFilter.cls.xml)	(revision 49092)
+++ AXimpl/Dynamics/InventoryOut/MaatwerkIteratorFilter.cls.xml	(.../MaatwerkIteratorFilter.cls.xml)	(revision 55463)
@@ -8,22 +8,29 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProductTypeApi">
+<Type>DOM.PM.ProductTypeAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>IsStockOverKinderenBepaler:AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler</FormalSpec>
+<FormalSpec>IsStockOverKinderenBepaler:AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler="",ProductTypeApi:DOM.PM.ProductTypeAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..IsStockOverKinderenBepaler = $$$Inject(IsStockOverKinderenBepaler,##class(AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New())
+	Set ..ProductTypeApi = $$$Inject(ProductTypeApi, ##class(DOM.PM.impl.ProductTypeAPIimpl).%New())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="IsValid">
 <FormalSpec>Item:TECH.ResultSet</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit $$$Not(..IsStockOverKinderenBepaler.IsStockOverKinderen(Item.GetDataByName("ProductNr")))
+<Implementation><![CDATA[	Quit $$$Not(..IsStockOverKinderenBepaler.IsStockOverKinderen(Item.GetDataByName("ProductNr")) && $$$Not(..ProductTypeApi.IsSpaceTowerProduct(Item.GetDataByName("ProductNr"))))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/MaatwerkIteratorFilter/Test.cls.xml
===================================================================
diff -u -r49092 -r55463
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/MaatwerkIteratorFilter/Test.cls.xml	(.../Test.cls.xml)	(revision 49092)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/MaatwerkIteratorFilter/Test.cls.xml	(.../Test.cls.xml)	(revision 55463)
@@ -3,24 +3,98 @@
 <Class name="vhUnitTest.AXimpl.Dynamics.InventoryOut.MaatwerkIteratorFilter.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Parameter name="ProductId">
+<Type>%String</Type>
+<Default>1000</Default>
+</Parameter>
+
+<Property name="IsStockOverKinderenBepaler">
+<Type>AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductTypeApi">
+<Type>DOM.PM.ProductTypeAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..IsStockOverKinderenBepaler = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New()
+	Set ..ProductTypeApi = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+]]></Implementation>
+</Method>
+
 <Method name="Test: IsValid geeft True als het geen StockOverKinderen is">
 <Implementation><![CDATA[
-	#dim ProductNr As %String = "1000"
 	#dim ProductNrLijst As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
-	Do ProductNrLijst.Insert($listbuild(ProductNr))
+	Do ProductNrLijst.Insert($listbuild(..#ProductId))
 	#dim LijstHeader As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
 	Do LijstHeader.Insert("ProductNr")
 	#dim ResultSet As TECH.ResultSet = ##class(vhTest.Fake.TECH.ResultSet).%New(ProductNrLijst, LijstHeader)
 	Do ResultSet.Next()
 	
 	#dim IsStockOverKinderenBepalerStub As AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New()
-	Do IsStockOverKinderenBepalerStub.IndienMethodCall("IsStockOverKinderen",ProductNr).DanReturn($$$False)
+	Do IsStockOverKinderenBepalerStub.IndienMethodCall("IsStockOverKinderen",..#ProductId).DanReturn($$$False)
 	
-	#dim Result As %Boolean = ##class(AXimpl.Dynamics.InventoryOut.MaatwerkIteratorFilter).%New(IsStockOverKinderenBepalerStub).IsValid(ResultSet)
+	Set ..IsStockOverKinderenBepaler = IsStockOverKinderenBepalerStub
 	
+	#dim Result As %Boolean = ##class(AXimpl.Dynamics.InventoryOut.MaatwerkIteratorFilter).%New(..IsStockOverKinderenBepaler, ..ProductTypeApi).IsValid(ResultSet)
+	
 	Do $$$AssertTrue(Result)
 ]]></Implementation>
 </Method>
+
+<Method name="Test: IsValid geeft True als het wel StockOverKinderen is maar een spacetower is">
+<Implementation><![CDATA[
+	#dim ProductNrLijst As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	Do ProductNrLijst.Insert($listbuild(..#ProductId))
+	#dim LijstHeader As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	Do LijstHeader.Insert("ProductNr")
+	#dim ResultSet As TECH.ResultSet = ##class(vhTest.Fake.TECH.ResultSet).%New(ProductNrLijst, LijstHeader)
+	Do ResultSet.Next()
+	
+	#dim IsStockOverKinderenBepalerStub As AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New()
+	Do IsStockOverKinderenBepalerStub.IndienMethodCall("IsStockOverKinderen",..#ProductId).DanReturn($$$True)
+	
+	#dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct",..#ProductId).DanReturn($$$True)
+	
+	Set ..IsStockOverKinderenBepaler = IsStockOverKinderenBepalerStub
+	Set ..ProductTypeApi = ProductTypeApiStub
+	
+	#dim Result As %Boolean = ##class(AXimpl.Dynamics.InventoryOut.MaatwerkIteratorFilter).%New(..IsStockOverKinderenBepaler, ..ProductTypeApi).IsValid(ResultSet)
+	
+	Do $$$AssertTrue(Result)
+]]></Implementation>
+</Method>
+
+<Method name="Test: IsValid geeft False als het wel StockOverKinderen is en geen spacetower is">
+<Implementation><![CDATA[
+	#dim ProductNrLijst As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	Do ProductNrLijst.Insert($listbuild(..#ProductId))
+	#dim LijstHeader As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	Do LijstHeader.Insert("ProductNr")
+	#dim ResultSet As TECH.ResultSet = ##class(vhTest.Fake.TECH.ResultSet).%New(ProductNrLijst, LijstHeader)
+	Do ResultSet.Next()
+	
+	#dim IsStockOverKinderenBepalerStub As AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New()
+	Do IsStockOverKinderenBepalerStub.IndienMethodCall("IsStockOverKinderen",..#ProductId).DanReturn($$$True)
+	
+	#dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct",..#ProductId).DanReturn($$$False)
+	
+	Set ..IsStockOverKinderenBepaler = IsStockOverKinderenBepalerStub
+	Set ..ProductTypeApi = ProductTypeApiStub
+	
+	#dim Result As %Boolean = ##class(AXimpl.Dynamics.InventoryOut.MaatwerkIteratorFilter).%New(..IsStockOverKinderenBepaler, ..ProductTypeApi).IsValid(ResultSet)
+	
+	Do $$$AssertFalse(Result)
+]]></Implementation>
+</Method>
 </Class>