Index: vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml
===================================================================
diff -u -r47227 -r47492
--- vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml	(.../Test.cls.xml)	(revision 47227)
+++ vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml	(.../Test.cls.xml)	(revision 47492)
@@ -305,7 +305,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Stap 4 voor Van Hoecke is ReqGroupId BTO">
+<Method name="Test: Stap 4a voor Van Hoecke is ReqGroupId BTO Halux">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
 	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6051)
@@ -341,6 +341,78 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Stap 4b voor Van Hoecke is ReqGroupId BTS Halux met KindBouwstenen">
+<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 = "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($$$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)
+	
+	Do $$$AssertEquals(ReqGroupId,"BTS Halux")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Stap 4b voor Van Hoecke is ReqGroupId BTS Halux met HFBouwstenen">
+<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 = "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($$$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,"BTS Halux")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Stap 5 voor Van Hoecke is ReqGroupId MTO">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
@@ -457,6 +529,46 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Stap 6c voor Van Hoecke 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(5000)
+	
+	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()
+	
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
+	Set AxProduct.Basis.LinkType = "H"
+	Set AxProduct.Klassificatie.SubGroep = "GroepBRO/OL"
+	Set AxProduct.Basis.StockNietStock = "1"
+	Set AxProduct.Basis.ScanType = "0"
+	Set AxProduct.Klassificatie.HoofdGroep = "GroepOL"
+	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)
+	
+	Do $$$AssertEquals(ReqGroupId,"Handmatig")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Stap 7 voor Van Hoecke is ReqGroupId Min/Max">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
@@ -1668,7 +1780,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Stap 2a voor Halux is ReqGroupId BTS Vallin">
+<Method name="Test: Stap 2a voor Halux is ReqGroupId BTS Valing">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
 	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(7835)
@@ -1688,7 +1800,7 @@
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
 	
-	Do $$$AssertEquals(ReqGroupId,"BTS Vallin")
+	Do $$$AssertEquals(ReqGroupId,"BTS Valing")
 ]]></Implementation>
 </Method>