Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57217 -r57218
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57217)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57218)
@@ -65,10 +65,9 @@
 	Set ConfigVariant.InventTransId = Request.InventTransId
 	
 	#dim Product As DOM.PM.Product = ""
-	#dim ProductId As %String = ..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "AdminProductNummer")
 	
 	Try {
-		Set Product = ..GeefProduct(ProductId, Request)
+		Set Product = ..GeefProduct(Request)
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Set ConfigVariant.ErrorText = Exception.GeefOmschrijving()
@@ -92,14 +91,13 @@
 </Method>
 
 <Method name="GeefProduct">
-<FormalSpec>ProductId:%String,Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</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")
+	#dim Product As DOM.PM.Product = ..ProductService.GeefProduct(ProductId, Request.ItemId)
 	
-	Set Product = ..ProductService.GeefProduct(ProductId, Request.ItemId)
-	
 	If (($$$Not($IsObject(Product))) || (Product.IsGenerischProduct())) {
 		Set Product = ..ProductService.GeefProductGemaaktVolgensAxKenmerken(Request)
 	}