Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r57254 -r57267
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57254)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57267)
@@ -54,6 +54,114 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie NIET igv TBX">
+<Implementation><![CDATA[
+	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
+		#dim RandomProductId As %String = "RandomProductId"
+		#dim RandomNettoAankoopPrijs As %String = "RandomNettoAankoopPrijs"
+		#dim RandomGewicht As %String = "RandomGewicht"
+		
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn("RandomEANCode")
+		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn("RandomKorttekst")
+		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(RandomNettoAankoopPrijs)
+		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(RandomGewicht)
+		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(RandomProductId)
+		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$False)
+		
+		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
+		
+		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepaler.IndienMethodCall("Bepaal", RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).TBX())
+		
+		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+		Do ProductServiceMock.VerwachtMethodCall("GeefProduct", RandomProductId, Request.ItemId).DanReturn(ProductStub)
+		
+		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
+		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
+		
+		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
+		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
+		
+		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
+		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn("RandomSourcingDataAreaId")
+		
+		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
+		Do FormatterMock.VerwachtMethodCall("FormatNumber", RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
+		Do FormatterMock.VerwachtMethodCall("FormatNumber", RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
+		
+		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
+		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn("RandomAfbeeldingPad")
+		
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
+		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
+		
+		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
+		
+		Do BouwstenenConverterMock.Verifieer()
+		Do VariantDescriptionBepalerMock.Verifieer()
+		Do ProductServiceMock.Verifieer()
+		Do SourcingDataAreaIdBepalerMock.Verifieer()
+		Do FormatterMock.Verifieer()
+		Do AfbeeldingServiceMock.Verifieer()
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie NIET igv TAX">
+<Implementation><![CDATA[
+	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
+		#dim RandomProductId As %String = "RandomProductId"
+		#dim RandomNettoAankoopPrijs As %String = "RandomNettoAankoopPrijs"
+		#dim RandomGewicht As %String = "RandomGewicht"
+		
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn("RandomEANCode")
+		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn("RandomKorttekst")
+		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(RandomNettoAankoopPrijs)
+		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(RandomGewicht)
+		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(RandomProductId)
+		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$False)
+		
+		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
+		
+		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepaler.IndienMethodCall("Bepaal", RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).TAX())
+		
+		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+		Do ProductServiceMock.VerwachtMethodCall("GeefProduct", RandomProductId, Request.ItemId).DanReturn(ProductStub)
+		
+		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
+		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
+		
+		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
+		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
+		
+		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
+		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn("RandomSourcingDataAreaId")
+		
+		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
+		Do FormatterMock.VerwachtMethodCall("FormatNumber", RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
+		Do FormatterMock.VerwachtMethodCall("FormatNumber", RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
+		
+		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
+		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn("RandomAfbeeldingPad")
+		
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
+		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
+		
+		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
+		
+		Do BouwstenenConverterMock.Verifieer()
+		Do VariantDescriptionBepalerMock.Verifieer()
+		Do ProductServiceMock.Verifieer()
+		Do SourcingDataAreaIdBepalerMock.Verifieer()
+		Do FormatterMock.Verifieer()
+		Do AfbeeldingServiceMock.Verifieer()
+	}
+]]></Implementation>
+</Method>
+
 <Method name="Test: RequestConverter vult ErrorText in indien een exceptie geraised wordt bij het ophalen van het Product">
 <Implementation><![CDATA[
 	If ($$$Not(##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol())) {
@@ -191,6 +299,9 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Fixed"
 		
+		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepaler.IndienMethodCall("Bepaal", RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+				
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.VerwachtMethodCall("GeefProduct", RandomProductId, Request.ItemId).DanReturn(ProductStub)
 		
@@ -210,7 +321,7 @@
 		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
 		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn("RandomAfbeeldingPad")
 		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -243,6 +354,9 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
 		Set Request.AttrVsAdminProdNr = "ChangeRequest"
 		
+		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepaler.IndienMethodCall("Bepaal", RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+				
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.IndienMethodCall("GeefProduct", RandomProductId, Request.ItemId).DanReturn("")
 		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
@@ -263,7 +377,7 @@
 		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
 		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn("RandomAfbeeldingPad")
 		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -296,6 +410,9 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
 		Set Request.AttrVsAdminProdNr = "ChangeRequest"
 		
+		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepaler.IndienMethodCall("Bepaal", RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.IndienMethodCall("GeefProduct", RandomProductId, Request.ItemId).DanReturn(ProductStub)
 		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
@@ -316,7 +433,7 @@
 		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
 		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn("RandomAfbeeldingPad")
 		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -331,7 +448,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is niet meegegeven en GeefProduct geeft leeg">
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is niet meegegeven =&gt; Nieuw product volgens kenmerken">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
 		#dim RandomProductId As %String = "RandomProductId"
@@ -344,68 +461,14 @@
 		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(RandomNettoAankoopPrijs)
 		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(RandomGewicht)
 		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(RandomProductId)
-		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$False)
 		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
+		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest("")
 		Set Request.AttrVsAdminProdNr = "Customizable"
-		Set Request.Attribute = ##class(%ListOfDataTypes).%New()
 		
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.IndienMethodCall("GeefProduct", RandomProductId, Request.ItemId).DanReturn("")
-		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
+		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepaler.IndienMethodCall("Bepaal", "", Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
 		
-		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn("RandomSourcingDataAreaId")
-		
-		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
-		
-		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
-		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn("RandomAfbeeldingPad")
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		
-		Do BouwstenenConverterMock.Verifieer()
-		Do VariantDescriptionBepalerMock.Verifieer()
-		Do ProductServiceMock.Verifieer()
-		Do SourcingDataAreaIdBepalerMock.Verifieer()
-		Do FormatterMock.Verifieer()
-		Do AfbeeldingServiceMock.Verifieer()
-	}
-]]></Implementation>
-</Method>
-
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is niet meegegeven en GeefProduct geeft GenerischProduct">
-<Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim RandomProductId As %String = "RandomProductId"
-		#dim RandomNettoAankoopPrijs As %String = "RandomNettoAankoopPrijs"
-		#dim RandomGewicht As %String = "RandomGewicht"
-		
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn("RandomEANCode")
-		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn("RandomKorttekst")
-		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(RandomNettoAankoopPrijs)
-		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(RandomGewicht)
-		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(RandomProductId)
-		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$True)
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
-		Set Request.AttrVsAdminProdNr = "Customizable"
-		Set Request.Attribute = ##class(%ListOfDataTypes).%New()
-		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.IndienMethodCall("GeefProduct", RandomProductId, Request.ItemId).DanReturn(ProductStub)
 		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
 		
 		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
@@ -424,7 +487,7 @@
 		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
 		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn("RandomAfbeeldingPad")
 		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -447,11 +510,14 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Customizable"
 		
+		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepaler.IndienMethodCall("Bepaal", RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.IndienMethodCall("HeeftBezwaarVoorProductDelete", RandomProductId).DanReturn($$$False)
 		Do ProductServiceMock.IndienMethodCall("GeefProduct", RandomProductId, Request.ItemId).DanReturn("")
 		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock,,,,,,, LadeVariantBepaler)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -471,11 +537,14 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Customizable"
 		
+		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepaler.IndienMethodCall("Bepaal", RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.IndienMethodCall("HeeftBezwaarVoorProductDelete", RandomProductId).DanReturn($$$False)
 		Do ProductServiceMock.IndienMethodCall("GeefProduct", RandomProductId, Request.ItemId).DanReturn(ProductStub)
 		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock,,,,,,, LadeVariantBepaler)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -504,6 +573,9 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Customizable"
 		
+		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepaler.IndienMethodCall("Bepaal", RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+		
 		Set ProductData = ##class(DOM.PM.dto.ProductData).%New()
 		Set ProductData.PRNr = RandomProductId
 		Set ProductData.DossierNummer = RandomDossierNr
@@ -532,7 +604,7 @@
 		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
 		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn("RandomAfbeeldingPad")
 		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock, ProductDataFactoryStub)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock, ProductDataFactoryStub, LadeVariantBepaler)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -547,15 +619,13 @@
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Method "Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is meegegeven maar HeeftBezwaarVoorProductDelete is True"()
-{
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is meegegeven maar HeeftBezwaarVoorProductDelete is True">
+<Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
 		#dim RandomProductId As %String = "RandomProductId"
 		#dim RandomNettoAankoopPrijs As %String = "RandomNettoAankoopPrijs"
 		#dim RandomGewicht As %String = "RandomGewicht"
+		#dim RandomDossierNr As %String = "RandomDossierNr"
 		
 		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
 		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn("RandomEANCode")
@@ -567,6 +637,16 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Customizable"
 		
+		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepaler.IndienMethodCall("Bepaal", RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+		
+		Set ProductData = ##class(DOM.PM.dto.ProductData).%New()
+		Set ProductData.PRNr = RandomProductId
+		Set ProductData.DossierNummer = RandomDossierNr
+		
+		#dim ProductDataFactoryStub As vhTest.Mock.DOM.PM.dto.ProductDataFactory = ##class(vhTest.Mock.DOM.PM.dto.ProductDataFactory).%New()
+		Do ProductDataFactoryStub.IndienMethodCall("MaakProductData", RandomProductId, RandomDossierNr).DanReturn(ProductData)
+		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.IndienMethodCall("HeeftBezwaarVoorProductDelete", RandomProductId).DanReturn($$$True)
 		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
@@ -587,7 +667,7 @@
 		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
 		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn("RandomAfbeeldingPad")
 		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock, ProductDataFactoryStub, LadeVariantBepaler)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
@@ -599,10 +679,8 @@
 		Do FormatterMock.Verifieer()
 		Do AfbeeldingServiceMock.Verifieer()
 	}
-}
-*/
-]]></Content>
-</UDLText>
+]]></Implementation>
+</Method>
 
 <Method name="MaakRequest">
 <FormalSpec>ProductId:%String</FormalSpec>
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57257 -r57267
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57257)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57267)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",ProductTypeApi:DOM.PM.ProductTypeAPI=""</FormalSpec>
+<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57258 -r57267
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57258)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57267)
@@ -38,13 +38,13 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ProductTypeApi">
-<Type>DOM.PM.ProductTypeAPI</Type>
+<Property name="LadeVariantBepaler">
+<Type>WSimpl.AX.CalculatedProduct.LadeVariantBepaler</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",ProductTypeApi:DOM.PM.ProductTypeAPI=""</FormalSpec>
+<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -57,7 +57,7 @@
 	Set ..Formatter = $$$Inject(Formatter, ##class(AXimpl.Formatter).%New())
 	Set ..AfbeeldingService = $$$Inject(AfbeeldingService, ##class(WSimpl.AX.CalculatedProduct.AfbeeldingService).%New())
 	Set ..ProductDataFactory = $$$Inject(ProductDataFactory, ##class(DOM.PM.dto.ProductDataFactory).%New())
-	Set ..ProductTypeApi = $$$Inject(ProductTypeApi, ##class(DOM.PM.impl.ProductTypeAPIimpl).%New())
+	Set ..LadeVariantBepaler = $$$Inject(LadeVariantBepaler, ##class(WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -80,7 +80,7 @@
 	#dim ProductId As %String = ..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "AdminProductNummer")
 	
 	Try {
-		If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
+		If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol() && (..IsLbx(ProductId, Request.Attribute))) {
 			Set Product = ..GeefProductIndienIsActiefAttrVsAdminProdNrInBomBol(Request, ProductId)
 		} Else {
 			Set Product = ..GeefProduct(Request, ProductId)
@@ -216,6 +216,14 @@
 	Quit Attribute
 ]]></Implementation>
 </Method>
+
+<Method name="IsLbx">
+<FormalSpec>ProductId:%String,Kenmerken:%List</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..LadeVariantBepaler.Bepaal(ProductId, Kenmerken) = ##class(AXimpl.PM.enu.LadeVariant).LBX())
+]]></Implementation>
+</Method>
 </Class>