Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r56315 -r57215
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 56315)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57215)
@@ -56,7 +56,6 @@
 <ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant</ReturnType>
 <Implementation><![CDATA[
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant).%New()
-
 	Set ConfigVariant.MessageId = MessageId
 	Set ConfigVariant.RequestMessageId = Request.MessageId
 	Set ConfigVariant.ItemId = Request.ItemId
@@ -66,17 +65,8 @@
 	Set ConfigVariant.InventTransId = Request.InventTransId
 	
 	#dim Product As DOM.PM.Product = ""
-	#dim ProductId As %String = ""
-	#dim AttributesIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Request.Attribute)
+	#dim ProductId As %String = ..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "AdminProductNummer")
 	
-	While (AttributesIterator.HasNext()) {
-		#dim Attribute As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = AttributesIterator.Next()
-		
-		If (Attribute.Name = "AdminProductNummer") {
-			Set ProductId = Attribute.ValueTxt	
-		}
-	}
-	
 	Try {
 		Set Product = ..ProductService.GeefProduct(ProductId, Request.ItemId)
 		
@@ -86,7 +76,6 @@
 		
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		
 		Set ConfigVariant.ErrorText = Exception.GeefOmschrijving()
 	}
 				
@@ -100,15 +89,47 @@
 		Set ConfigVariant.Image = ..AfbeeldingService.GeefAfbeeldingPad(Product)
 		Set ConfigVariant.Weight = ..Formatter.FormatNumber(Product.GeefGewichtInGram(), 2)
 		
-		#dim AdminProductNummerAttribute As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityAttribute).%New()
-		Set AdminProductNummerAttribute.Name = "AdminProductNummer"
-		Set AdminProductNummerAttribute.ValueTxt = Product.GeefPRNr()
-		Do ConfigVariant.Attribute.Insert(AdminProductNummerAttribute)
+		Do ConfigVariant.Attribute.Insert(..GeefAxAttribute("AdminProductNummer", Product.GeefPRNr()))
 	}
 	
 	Quit ConfigVariant
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAttributeValueTxtVolgensAttributeName">
+<FormalSpec>AttributeLijst:%ListOfObjects,AttributeName:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim AttributesIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(AttributeLijst)
+	#dim AttributeValueTxt As %String = ""
+	
+	While (AttributesIterator.HasNext()) {
+		#dim Attribute As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = AttributesIterator.Next()
+		
+		If (Attribute.Name = AttributeName) {
+			Set AttributeValueTxt = Attribute.ValueTxt	
+			Continue
+		}
+	}
+	
+	Quit AttributeValueTxt
+]]></Implementation>
+</Method>
+
+<Method name="GeefAxAttribute">
+<FormalSpec>AttributeName:%String,AttributeValueTxt:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityAttribute</ReturnType>
+<Implementation><![CDATA[
+	#dim Attribute As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityAttribute).%New()
+	
+	Set Attribute.Name = AttributeName
+	Set Attribute.ValueTxt = AttributeValueTxt
+	
+	Quit Attribute
+]]></Implementation>
+</Method>
 </Class>