Index: vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml
===================================================================
diff -u -r48177 -r48586
--- vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml	(.../Test.cls.xml)	(revision 48177)
+++ vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml	(.../Test.cls.xml)	(revision 48586)
@@ -1742,7 +1742,25 @@
 	Set AxProduct.Basis.HerbestelSurplus = ""
 	Set AxProduct.Basis.HerbestelAfronding = ""
 	Set AxProduct.Basis.LinkType = "S"
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -1763,6 +1781,24 @@
 	Set AxProduct.Basis.HerbestelSurplus = "5"
 	Set AxProduct.Basis.HerbestelAfronding = ""
 		
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -1782,7 +1818,25 @@
 	Set AxProduct.Basis.StockNietStock = "1"
 	Set AxProduct.Basis.HerbestelSurplus = ""
 	Set AxProduct.Basis.HerbestelAfronding = "5"
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -1808,6 +1862,24 @@
 	
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
 	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -1831,7 +1903,25 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -1855,7 +1945,25 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -1879,7 +1987,25 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -1903,7 +2029,25 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -1927,7 +2071,25 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -1951,7 +2113,25 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -1975,7 +2155,25 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -1999,7 +2197,25 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -2023,7 +2239,25 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -2047,7 +2281,25 @@
 	Set AxProduct.Basis.LinkType = "HH"
 	
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
-		
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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)
@@ -2056,18 +2308,78 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Stap 4 voor Halux is ReqGroupId Handmatig">
+<Method name="Test: Stap 3 voor Halux is ReqGroupId MTS">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
 	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6332)
 	
+	Set ConvertorLeveranciersnummerVanHoeckeNaarHalux = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.Convertor.ConvertorLeveranciersnummerVanHoeckeNaarHalux).%New()
+	Do ConvertorLeveranciersnummerVanHoeckeNaarHalux.IndienMethodCall("ConvertorLeveranciersnummerVanHoeckeNaarHalux","6892").DanReturn("05692")
+	
 	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).HaluxNv()
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
-		
+	Set AxProduct.Basis.StockNietStock = "1"
+	Set AxProduct.Basis.LinkType = "S"
+	
+	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ConvertorLeveranciersnummerVanHoeckeNaarHalux
+	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	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,"MTS")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Stap 4 voor Halux is ReqGroupId Handmatig">
+<Implementation><![CDATA[
+	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
+	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6332)
+	
+	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).HaluxNv()
+	
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.HerbestelSurplus = "5"
 	
+	#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)
+	Do ProductImplMock.IndienMethodCall("GeefGenerischProductID").DanReturn("GenerischProductID")
+	
+	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,"Handmatig")
Index: AXimpl/Utils.cls.xml
===================================================================
diff -u -r48584 -r48586
--- AXimpl/Utils.cls.xml	(.../Utils.cls.xml)	(revision 48584)
+++ AXimpl/Utils.cls.xml	(.../Utils.cls.xml)	(revision 48586)
@@ -233,11 +233,11 @@
 	#dim StockNietStock As %String = Product.Basis.StockNietStock
 	#dim PrimaryVendorId = ..ConvertPrimaryVendorId(Firma,Product)
 	#dim ScanType As %String = Product.Basis.ScanType
+	#dim ProductNr As %Integer = Product.Basis.ProductNr
+	#dim ProductImpl As DOM.PM.Product = ..ProductApi.GeefProduct(ProductNr)
+	#dim HeeftBouwstenen As %Boolean = $$$If(((ProductImpl.GeefKindBouwstenenIterator().HasNext()) || (ProductImpl.GeefHFBouwstenenIterator().HasNext())),$$$True,$$$False)
 	
 	If Firma = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv() {
-		#dim ProductNr As %Integer = Product.Basis.ProductNr
-		#dim ProductImpl As DOM.PM.Product = ..ProductApi.GeefProduct(ProductNr)
-		#dim HeeftBouwstenen As %Boolean = $$$If(((ProductImpl.GeefKindBouwstenenIterator().HasNext()) || (ProductImpl.GeefHFBouwstenenIterator().HasNext())),$$$True,$$$False)
 		#dim DefaultOrderTypeVHBE As %String = ..ConvertDefaultOrderType(Firma,Product)
 		#dim NonAktief As %String = Product.Basis.NONAktief
 		#dim SubGroep As %String = Product.Klassificatie.SubGroep
@@ -357,6 +357,7 @@
 		#dim Herbestelsurplus As %String = Product.Basis.HerbestelSurplus
 		#dim Herbestelafronding As %String = Product.Basis.HerbestelAfronding
 		#dim DefaultOrderTypeHLX As %String = ..ConvertDefaultOrderType(Firma,Product)
+		#dim IsGenerischAfgeleid As %Boolean = $$$If($$$HasLength(ProductImpl.GeefGenerischProductID()),$$$True,$$$False)
 		
 		Set ReqGroupId = "Handmatig"
 		If ((Herbestelsurplus = "") && (Herbestelafronding = "") && (PrimaryVendorId = "05497")){
@@ -389,6 +390,8 @@
 					Set ReqGroupId = "BTS AngstP"
 				}
 			}
+		} ElseIf ((DefaultOrderTypeHLX = "Productie") && (HeeftBouwstenen) && (LeverancierNummer = "6332") && ($$$Not(IsGenerischAfgeleid))) {
+			Set ReqGroupId = "MTS"
 		}
 	} Else {
 		Write !,"Geef als parameter ofwel VHBE, ofwel HLX mee!"