Index: AXimpl/Utils.cls.xml
===================================================================
diff -u -r46295 -r46302
--- AXimpl/Utils.cls.xml	(.../Utils.cls.xml)	(revision 46295)
+++ AXimpl/Utils.cls.xml	(.../Utils.cls.xml)	(revision 46302)
@@ -219,10 +219,10 @@
 	#dim ReqGroupId As %String = ""
 	#dim LeverancierNummer As %String = Product.Basis.LeverancierNummer
 	#dim StockNietStock As %String = Product.Basis.StockNietStock
+	#dim PrimaryVendorId = ..ConvertPrimaryVendorId(Firma,Product)
 	
 	If Firma = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv() {
 		#dim DefaultOrderTypeVHBE As %String = ..ConvertDefaultOrderType(Firma,Product)
-		#dim PrimaryVendorId = ..ConvertPrimaryVendorId(Firma,Product)
 		#dim SubGroep As %String = Product.Klassificatie.SubGroep
 		#dim SubGroepBevatVPK As %Boolean = ##class(TECH.StringUtils).Contains(SubGroep,"VPK/")
 		#dim SubGroepBevatVPA As %Boolean = ##class(TECH.StringUtils).Contains(SubGroep,"VPA/")
@@ -258,7 +258,7 @@
 				If (LeverancierNummer = "5005"){
 				Set ReqGroupId = "BTO Blum"
 				} Else {
-					Set ReqGroupId = "BTO ntBlum"
+					Set ReqGroupId = "BTO"
 				}
 			} ElseIf (StockNietStock = "1") {
 				If (PrimaryVendorId = "06332") {
@@ -301,7 +301,7 @@
 					Set ReqGroupId = "BTS Devos"
 				} ElseIf (LeverancierNummer = "5026"){
 					Set ReqGroupId = "BTS Henke"
-				} ElseIf (LeverancierNummer = "6447"){
+				} ElseIf (LeverancierNummer = "8090"){
 					Set ReqGroupId = "BTS WaseW"
 				} ElseIf (LeverancierNummer = "5490"){
 					Set ReqGroupId = "BTS Knapp"
@@ -334,15 +334,15 @@
 		#dim DefaultOrderTypeHLX As %String = ..ConvertDefaultOrderType(Firma,Product)
 		
 		Set ReqGroupId = "Handmatig"
-		If ((Herbestelsurplus = "") && (Herbestelafronding = "") && (LeverancierNummer = "6051")){
+		If ((Herbestelsurplus = "") && (Herbestelafronding = "") && (PrimaryVendorId = "05497")){
 			Set ReqGroupId = "BTO"
 		} ElseIf (DefaultOrderTypeHLX = "Aankooporder"){
 			If (StockNietStock = "1"){
-				If (LeverancierNummer = "5898"){
+				If (LeverancierNummer = "7835"){
 					Set ReqGroupId = "BTS Vallin"
 				}ElseIf (LeverancierNummer = "6628"){
 					Set ReqGroupId = "BTS Stylin"
-				}ElseIf (LeverancierNummer = "5921"){
+				}ElseIf (LeverancierNummer = "7407"){
 					Set ReqGroupId = "BTS Decosp"
 				}ElseIf (LeverancierNummer = "7802"){
 					Set ReqGroupId = "BTS Egger"
@@ -358,9 +358,9 @@
 					Set ReqGroupId = "BTS Beneen"
 				}ElseIf (LeverancierNummer = "6892"){
 					Set ReqGroupId = "BTS AngstP"
-				}
-			} ElseIf ((Herbestelsurplus '= "") && (Herbestelafronding '= "")){
-				Set ReqGroupId = "BTS-IC"
+				}ElseIf ((Herbestelsurplus '= "") && (Herbestelafronding '= "")){
+					Set ReqGroupId = "BTS-IC"
+				} 
 			}
 		}
 	} Else {
Index: vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml
===================================================================
diff -u -r46275 -r46302
--- vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml	(.../Test.cls.xml)	(revision 46275)
+++ vhUnitTest/AXimpl/Utils/ConvertReqGroupId/Test.cls.xml	(.../Test.cls.xml)	(revision 46302)
@@ -123,7 +123,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Stap 3b voor Van Hoecke is ReqGroupId BTO ntBlum">
+<Method name="Test: Stap 3b voor Van Hoecke is ReqGroupId BTO">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
 	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6051)
@@ -138,7 +138,7 @@
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)
 	
-	Do $$$AssertEquals(ReqGroupId,"BTO ntBlum")
+	Do $$$AssertEquals(ReqGroupId,"BTO")
 ]]></Implementation>
 </Method>
 
@@ -607,7 +607,7 @@
 <Method name="Test: Stap 9o voor Van Hoecke is ReqGroupId BTS WaseW">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
-	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6447)
+	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(8090)
 	
 	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()
 	
@@ -842,7 +842,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Stap 1 voor Halux Als HerbestelSurplus leeg is en HerbestelAfronding leeg is en LeverancierNummer 6051 is dan moet ReqGroupId BTO zijn">
+<Method name="Test: Stap 1 voor Halux Als HerbestelSurplus leeg is en HerbestelAfronding leeg is en PrimaryVendorId 05497 is dan moet ReqGroupId BTO zijn">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
 	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6051)
@@ -852,6 +852,7 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.HerbestelSurplus = ""
 	Set AxProduct.Basis.HerbestelAfronding = ""
+	Set AxProduct.Basis.LinkType = "S"
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
@@ -864,12 +865,13 @@
 <Method name="Test: Stap 2a voor Halux is ReqGroupId BTS Vallin">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
-	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(5898)
+	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(7835)
 	
 	#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.HerbestelSurplus = "5"
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
@@ -888,6 +890,7 @@
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.StockNietStock = "1"
+	Set AxProduct.Basis.HerbestelSurplus = "5"
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
@@ -900,12 +903,13 @@
 <Method name="Test: Stap 2c voor Halux is ReqGroupId BTS Decosp">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
-	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(5921)
+	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(7407)
 	
 	#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.HerbestelSurplus = "5"
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
@@ -924,6 +928,7 @@
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.StockNietStock = "1"
+	Set AxProduct.Basis.HerbestelSurplus = "5"
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
@@ -942,6 +947,7 @@
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.StockNietStock = "1"
+	Set AxProduct.Basis.HerbestelSurplus = "5"
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
@@ -960,6 +966,7 @@
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.StockNietStock = "1"
+	Set AxProduct.Basis.HerbestelSurplus = "5"
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
@@ -978,6 +985,7 @@
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.StockNietStock = "1"
+	Set AxProduct.Basis.HerbestelSurplus = "5"
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
@@ -996,6 +1004,7 @@
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.StockNietStock = "1"
+	Set AxProduct.Basis.HerbestelSurplus = "5"
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
@@ -1014,6 +1023,7 @@
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.StockNietStock = "1"
+	Set AxProduct.Basis.HerbestelSurplus = "5"
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
@@ -1032,6 +1042,7 @@
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.StockNietStock = "1"
+	Set AxProduct.Basis.HerbestelSurplus = "5"
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
@@ -1049,6 +1060,7 @@
 	#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.HerbestelSurplus = "5"
 	Set AxProduct.Basis.HerbestelAfronding = "5"
 		
@@ -1070,6 +1082,7 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 		
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
+	Set AxProduct.Basis.HerbestelSurplus = "5"
 	
 	#dim ReqGroupId As %String = Converter.ConvertReqGroupId(Firma,AxProduct)