Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57254 -r57257
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57254)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57257)
@@ -38,8 +38,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProductTypeApi">
+<Type>DOM.PM.ProductTypeAPI</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=""</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="",ProductTypeApi:DOM.PM.ProductTypeAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -52,6 +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())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -71,12 +77,13 @@
 	Set ConfigVariant.InventTransId = Request.InventTransId
 	
 	#dim Product As DOM.PM.Product = ""
+	#dim ProductId As %String = ..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "AdminProductNummer")
 	
 	Try {
 		If ($$$Not(##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol())) {
-			Set Product = ..GeefProduct(Request)
+			Set Product = ..GeefProduct(Request, ProductId)
 		} Else {
-			Set Product = ..GeefProductIndienIsActiefAttrVsAdminProdNrInBomBol(Request)
+			Set Product = ..GeefProductIndienIsActiefAttrVsAdminProdNrInBomBol(Request, ProductId)
 		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -101,11 +108,10 @@
 </Method>
 
 <Method name="GeefProduct">
-<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,ProductId:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>DOM.PM.Product</ReturnType>
 <Implementation><![CDATA[
-	#dim ProductId As %String = ..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "AdminProductNummer")
 	#dim Product As DOM.PM.Product = ..ProductService.GeefProduct(ProductId, Request.ItemId)
 	
 	If (($$$Not($IsObject(Product))) || (Product.IsGenerischProduct())) {
@@ -117,31 +123,30 @@
 </Method>
 
 <Method name="GeefProductIndienIsActiefAttrVsAdminProdNrInBomBol">
-<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,ProductId:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>DOM.PM.Product</ReturnType>
 <Implementation><![CDATA[
 	#dim Product As DOM.PM.Product = ""
 	
 	If (Request.AttrVsAdminProdNr = "Customizable") {
-		Set Product = ..GeefProductCustomizableAttrVsAdminProdNr(Request)
+		Set Product = ..GeefProductCustomizableAttrVsAdminProdNr(Request, ProductId)
 	} ElseIf (Request.AttrVsAdminProdNr = "ChangeRequest") {
 		Set Product = ..GeefProductChangeRequestAttrVsAdminProdNr(Request)
 	} ElseIf (Request.AttrVsAdminProdNr = "Fixed") {
-		Set Product = ..GeefProductFixedAttrVsAdminProdNr(Request)
+		Set Product = ..GeefProductFixedAttrVsAdminProdNr(Request, ProductId)
 	}
 	
 	Quit Product
 ]]></Implementation>
 </Method>
 
 <Method name="GeefProductCustomizableAttrVsAdminProdNr">
-<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,ProductId:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>DOM.PM.Product</ReturnType>
 <Implementation><![CDATA[
 	#dim Product As DOM.PM.Product = ""
-	#dim ProductId As %String = ..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "AdminProductNummer")
 	
 	If (($$$HasLength(ProductId)) && ($$$Not(..ProductService.HeeftBezwaarVoorProductDelete(ProductId)))) {
 		Set Product = ..ProductService.GeefProduct(ProductId, Request.ItemId)
@@ -170,13 +175,10 @@
 </Method>
 
 <Method name="GeefProductFixedAttrVsAdminProdNr">
-<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,ProductId:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>DOM.PM.Product</ReturnType>
-<Implementation><![CDATA[
-	#dim ProductId As %String = ..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "AdminProductNummer")
-	
-	Quit ..ProductService.GeefProduct(ProductId, Request.ItemId)
+<Implementation><![CDATA[	Quit ..ProductService.GeefProduct(ProductId, Request.ItemId)
 ]]></Implementation>
 </Method>
 
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57254 -r57257
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57254)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57257)
@@ -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=""</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="",ProductTypeApi:DOM.PM.ProductTypeAPI=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>