Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r43073 -r43076
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43073)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43076)
@@ -16,7 +16,8 @@
 	Set DummyRequest.ItemId = RandomItemId
 	
 	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
-	Do ProductApiMock.VerwachtMethodCall("BestaatProduct", RandomItemId)
+	Do ProductApiMock.VerwachtMethodCall("BestaatProduct", RandomItemId).DanReturn($$$True)
+	Do ProductApiMock.VerwachtMethodCall("GeefProduct", RandomItemId).DanReturn(##class(vhTest.Dummy.DOM.PM.Product).%New())
 	
 	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiMock)
 	
@@ -28,12 +29,12 @@
 
 <Method name="Test: RequestConverter geeft altijd een AxdEntityConfigVariant terug">
 <Implementation><![CDATA[
-	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
-	Do ProductApiMock.IndienMethodCall("BestaatProduct", $$$ElkeWaarde)
+	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde)
 	
 	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	
-	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiMock)
+	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
 	
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(DummyRequest)
 	
@@ -43,12 +44,12 @@
 
 <Method name="Test: RequestConverter vult ErrorText in indien geen bouwstenen gevonden worden">
 <Implementation><![CDATA[
-	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
-	Do ProductApiMock.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
+	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
 	
 	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	
-	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiMock)
+	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
 	
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(DummyRequest)
 	
@@ -58,13 +59,13 @@
 
 <Method name="Test: RequestConverter vult MessageId altijd in">
 <Implementation><![CDATA[
-	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
-	Do ProductApiMock.IndienMethodCall("BestaatProduct", $$$ElkeWaarde)
+	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
 	
 	#dim RandomMessageId As %String = "RandomMessageId"
 	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	
-	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiMock)
+	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
 	
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(DummyRequest, RandomMessageId)
 	
@@ -74,8 +75,8 @@
 
 <Method name="Test: RequestConverter neemt velden ItemId, ConfigId en SalesId altijd over van Request">
 <Implementation><![CDATA[
-	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
-	Do ProductApiMock.IndienMethodCall("BestaatProduct", $$$ElkeWaarde)
+	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
 	
 	#dim RandomItemId As %String = "RandomItemId"
 	#dim RandomConfigId As %String = "RandomConfigId"
@@ -86,7 +87,7 @@
 	Set DummyRequest.ConfigId = RandomConfigId
 	Set DummyRequest.SalesId = RandomSalesId
 	
-	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiMock)
+	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
 	
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(DummyRequest)
 
@@ -95,6 +96,27 @@
 	Do $$$AssertEquals(ConfigVariant.SalesId, RandomSalesId)
 ]]></Implementation>
 </Method>
+
+<Method name="Test: RequestConverter haalt velden op van gevonden Product">
+<Implementation><![CDATA[
+	#dim RandomEanCode As %String = "RandomEanCode"
+	#dim ProductMock As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Do ProductMock.VerwachtMethodCall("GeefEANCode").DanReturn(RandomEanCode)
+	
+	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$True)
+	Do ProductApiStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde).DanReturn(ProductMock)
+	
+	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
+		
+	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(DummyRequest)
+	
+	Do $$$AssertEquals(ConfigVariant.GTIN, RandomEanCode)
+	
+	Do ProductMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r43073 -r43076
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 43073)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 43076)
@@ -34,7 +34,9 @@
 	Set ConfigVariant.SalesId = Request.SalesId
 
 	If (..ProductApi.BestaatProduct(Request.ItemId)) {
+		#dim Product As DOM.PM.Product = ..ProductApi.GeefProduct(Request.ItemId)
 
+		Set ConfigVariant.GTIN = Product.GeefEANCode()
 	} Else {
 		Set ConfigVariant.ErrorText = ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound()	
 	}