Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57428 -r57492
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57428)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57492)
@@ -80,8 +80,7 @@
 	#dim ProductId As %String = ..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "AdminProductNummer")
 	
 	Try {
-		If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol() && 
-			((..IsLbx(ProductId, Request.Attribute)) || (..IsTax(ProductId, Request.Attribute)))) {
+		If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol() && (..IsLbx(ProductId, Request.Attribute))) {
 			Set Product = ..ProductVolgensAxAttribuutBepaler.GeefProductVolgensAttrVsAdminProdNr(Request)
 		} Else {
 			Set Product = ..GeefProduct(Request, ProductId)
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r57428 -r57492
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57428)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57492)
@@ -233,7 +233,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie WEL igv TAX">
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie NIET igv TAX">
 <Implementation><![CDATA[
 	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$True, ..#Applicatie)
 	
@@ -242,19 +242,19 @@
 	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 	
 	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).ExactAantalKeer(0)
+	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub) //.ExactAantalKeer(0)
 	Set ..ProductService = ProductServiceMock
 	
-	#dim ProductVolgensAxAttribuutBepalerMock As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler).%New()
-	Do ProductVolgensAxAttribuutBepalerMock.VerwachtMethodCall("GeefProductVolgensAttrVsAdminProdNr", Request).DanReturn(ProductStub)
-	Set ..ProductVolgensAxAttribuutBepaler = ProductVolgensAxAttribuutBepalerMock
+	;#dim ProductVolgensAxAttribuutBepalerMock As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler).%New()
+	;Do ProductVolgensAxAttribuutBepalerMock.VerwachtMethodCall("GeefProductVolgensAttrVsAdminProdNr", Request).DanReturn(ProductStub)
+	;Set ..ProductVolgensAxAttribuutBepaler = ProductVolgensAxAttribuutBepalerMock
 	
 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).TAX())
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 	
 	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
 	Do ..Verifieer()
-	Do ..ProductVolgensAxAttribuutBepaler.Verifieer()
+	;Do ..ProductVolgensAxAttribuutBepaler.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -274,7 +274,7 @@
 	Do ProductVolgensAxAttribuutBepalerMock.VerwachtMethodCall("GeefProductVolgensAttrVsAdminProdNr", Request).DanReturn(ProductStub)
 	Set ..ProductVolgensAxAttribuutBepaler = ProductVolgensAxAttribuutBepalerMock
 	
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).TAX())
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).LBX())
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 	
 	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -389,9 +389,9 @@
 <Method name="Verifieer">
 <Private>1</Private>
 <Implementation><![CDATA[
+	Do ..ProductService.Verifieer()
 	Do ..BouwstenenConverter.Verifieer()
 	Do ..VariantDescriptionBepaler.Verifieer()
-	Do ..ProductService.Verifieer()
 	Do ..SourcingDataAreaIdBepaler.Verifieer()
 	Do ..Formatter.Verifieer()
 	Do ..AfbeeldingService.Verifieer()