Index: vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml
===================================================================
diff -u -r46489 -r47225
--- vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml	(.../Test.cls.xml)	(revision 46489)
+++ vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml	(.../Test.cls.xml)	(revision 47225)
@@ -18,6 +18,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProductApi">
+<Type>DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="VoorraadInstellingCalculator">
 <Type>AX.Uitgaand.PM.VrijgegProduct.impl.VoorraadInstellingCalculator</Type>
 <Private>1</Private>
@@ -37,6 +42,7 @@
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ##class(vhTest.Fake.AX.Uitgaand.PM.impl.Convertor.ConvertorLeveranciersnummerVanHoeckeNaarHalux).%New()
 	Set ..PartijApi = ##class(vhTest.Fake.DOM.PARTIJ.PartijAPI).%New()
 	Set ..VoorraadInstellingCalculator = ##class(vhTest.Fake.AX.Uitgaand.PM.VrijgegProduct.impl.VoorraadInstellingCalculator).%New()
+	Set ..ProductApi = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 ]]></Implementation>
 </Method>
 
@@ -47,7 +53,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Stap 1 voor Van Hoecke is ReqGroupId MTO igv OL">
+<Method name="Test: Stap 1a voor Van Hoecke is ReqGroupId MTO met GeefKindBouwstenenIterator">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
 	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6051)
@@ -56,9 +62,25 @@
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.LinkType = "S"
-	Set AxProduct.Klassificatie.HoofdGroep = "Groep/OL"
-	Set AxProduct.Basis.KortTekst = "OLkorttekst"
+	Set AxProduct.Basis.NONAktief = "2"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$True)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -67,7 +89,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Stap 1 voor Van Hoecke is ReqGroupId MTO igv TA">
+<Method name="Test: Stap 1b voor Van Hoecke is ReqGroupId MTO met GeefHFBouwstenenIterator">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
 	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6051)
@@ -76,9 +98,25 @@
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.LinkType = "S"
-	Set AxProduct.Klassificatie.HoofdGroep = "Groep/TA"
-	Set AxProduct.Basis.KortTekst = "TAkorttekst"
+	Set AxProduct.Basis.NONAktief = "2"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$True)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -87,6 +125,42 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Stap 1c voor Van Hoecke is ReqGroupId MTO ook als NONAktief leeg is">
+<Implementation><![CDATA[
+	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
+	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6051)
+	
+	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()
+	
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
+	Set AxProduct.Basis.LinkType = "S"
+	Set AxProduct.Basis.NONAktief = ""
+	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$True)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$True)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
+	#dim Converter As AXimpl.Utils = ..GeefConverter()
+	
+	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
+	
+	Do $$$AssertEquals(ReqGroupId,"MTO")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Stap 2a voor Van Hoecke is ReqGroupId Handmatig">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
@@ -98,6 +172,23 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	Set AxProduct.Klassificatie.SubGroep = "VPK/Groep"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -117,6 +208,23 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	Set AxProduct.Klassificatie.SubGroep = "VPA/Groep"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -136,6 +244,23 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	Set AxProduct.Basis.StockNietStock = "2"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -155,6 +280,23 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	Set AxProduct.Basis.StockNietStock = "2"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -174,6 +316,23 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	Set AxProduct.Basis.StockNietStock = "1"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -193,6 +352,23 @@
 	Set AxProduct.Basis.LinkType = "H"
 	Set AxProduct.Basis.StockNietStock = "1"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -216,6 +392,23 @@
 	Set AxProduct.Klassificatie.HoofdGroep = "GroepZZ"
 	Set AxProduct.Klassificatie.Groep = "GroepYYY"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -239,6 +432,23 @@
 	Set AxProduct.Klassificatie.HoofdGroep = "GroepTA"
 	Set AxProduct.Klassificatie.Groep = "GroepDRU"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -259,6 +469,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "8"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -285,6 +512,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -311,6 +555,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -337,6 +598,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "L"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -357,6 +635,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -377,6 +672,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -397,6 +709,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -417,6 +746,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -437,6 +783,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -457,6 +820,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -477,6 +857,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -497,6 +894,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -517,6 +931,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -537,6 +968,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -557,6 +1005,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -577,6 +1042,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -597,6 +1079,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -617,6 +1116,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -637,6 +1153,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -657,6 +1190,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -677,6 +1227,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -697,6 +1264,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -717,6 +1301,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -737,6 +1338,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -757,6 +1375,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -777,6 +1412,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -797,6 +1449,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -817,6 +1486,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -836,6 +1522,23 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -855,6 +1558,23 @@
 	Set AxProduct.Basis.LinkType = "S"
 	Set AxProduct.Basis.ScanType = "0"
 	
+	#dim IteratorMockKind As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockKind.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockKind.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	#dim IteratorMockHF As TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do IteratorMockHF.IndienMethodCall("Reset").DanDoeNiks()
+	Do IteratorMockHF.IndienMethodCall("HasNext").DanReturn($$$False)
+	
+	Set ProductImplMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Do ProductImplMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(IteratorMockKind)
+	Do ProductImplMock.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(IteratorMockHF)
+	
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.IndienMethodCall("GeefProduct",..#ProductId).DanReturn(ProductImplMock)
+	
+	Set ..ProductApi = ProductApiMock
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
@@ -1165,7 +1885,7 @@
 <Method name="GeefConverter">
 <Private>1</Private>
 <ReturnType>AXimpl.Utils</ReturnType>
-<Implementation><![CDATA[	quit ##class(AXimpl.Utils).%New(..PartijApi,..ConvertorLeveranciersnummerVanHoeckeNaarHalux,..VoorraadInstellingCalculator)
+<Implementation><![CDATA[	quit ##class(AXimpl.Utils).%New(..PartijApi,..ConvertorLeveranciersnummerVanHoeckeNaarHalux,..VoorraadInstellingCalculator,,,, ..ProductApi)
 ]]></Implementation>
 </Method>
 </Class>