Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r43313 -r43322
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 43313)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 43322)
@@ -53,7 +53,7 @@
 		Set ConfigVariant.SourcingDataAreaId = ..InterneFirmaBepaler.Bepaal(Product.GeefPRNr())
 		Set ConfigVariant.ProductName = Product.GeefKorttekst()
 		Set ConfigVariant.CostPrice = Product.GeefNettoAankoopPrijsInclCif()
-		Set ConfigVariant.VariantDescription = ..VariantDescriptionBepaler.Bepaal(Product)
+		Set ConfigVariant.VariantDescription = ..VariantDescriptionBepaler.Bepaal(Product, ConfigVariant.ConfigVariantId)
 	} Else {
 		Set ConfigVariant.ErrorText = ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound()	
 	}
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/Test.cls.xml
===================================================================
diff -u -r43309 -r43322
--- vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 43309)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 43322)
@@ -18,7 +18,7 @@
 	Do ProductMock.VerwachtMethodCall("GeefLangtekst", ##class(DOM.enu.Taal).Engels(), 1).DanReturn(RandomVertalingEngels)
 	Do ProductMock.VerwachtMethodCall("GeefLangtekst", ##class(DOM.enu.Taal).Duits(), 1).DanReturn(RandomVertalingDuits)
 	
-	#dim VariantDescriptionList As %ListOfObjects = VariantDescriptionBepaler.Bepaal(ProductMock)
+	#dim VariantDescriptionList As %ListOfObjects = VariantDescriptionBepaler.Bepaal(ProductMock, "RandomItemId")
 	
 	Do $$$AssertEquals(VariantDescriptionList.Count(), 4)
 	
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml
===================================================================
diff -u -r43313 -r43322
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml	(.../RequestData.cls.xml)	(revision 43313)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml	(.../RequestData.cls.xml)	(revision 43322)
@@ -3,12 +3,12 @@
 <Class name="vhUnitTest.WSimpl.AX.CalculatedProduct.RequestConverter.Test.RequestData">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: RequestConverter neemt velden ItemId, ConfigId en SalesId over van Request en vult ConfigVariantId in indien Product bestaat">
+<Method name="Test: RequestConverter neemt velden ItemId, ConfigId en SalesId over van Request en vult ConfigVariantId in met ItemId indien Product bestaat">
 <Implementation><![CDATA[	Do ..Assert($$$True)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: RequestConverter neemt velden ItemId, ConfigId en SalesId over van Request en vult ConfigVariantId in indien Product niet bestaat">
+<Method name="Test: RequestConverter neemt velden ItemId, ConfigId en SalesId over van Request en vult ConfigVariantId in met ItemId indien Product niet bestaat">
 <Implementation><![CDATA[	Do ..Assert($$$False)
 ]]></Implementation>
 </Method>
@@ -35,12 +35,15 @@
 	
 	#dim InterneFirmaBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.InterneFirmaBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.InterneFirmaBepaler).%New()
 	Do InterneFirmaBepalerStub.IndienMethodCall("Bepaal", $$$ElkeWaarde).DanReturn($$$DummyString)
+	
+	#dim VariantDescriptionBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
+	Do VariantDescriptionBepalerStub.IndienMethodCall("Bepaal", ProductDummy, RandomItemId).DanReturn(##class(%ListOfObjects).%New())
 		
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub, InterneFirmaBepalerStub)
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub, InterneFirmaBepalerStub, VariantDescriptionBepalerStub)
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(DummyRequest, "RandomMessageId")
 
 	Do $$$AssertEquals(ConfigVariant.ItemId, RandomItemId)
-	Do $$$AssertEquals(ConfigVariant.ConfigVariantId, RandomItemId)
+	Do $$$AssertEquals(ConfigVariant.ConfigVariantId, ConfigVariant.ItemId)
 	Do $$$AssertEquals(ConfigVariant.ConfigId, RandomConfigId)
 	Do $$$AssertEquals(ConfigVariant.SalesId, RandomSalesId)
 ]]></Implementation>
Index: WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml
===================================================================
diff -u -r43309 -r43322
--- WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml	(.../VariantDescriptionBepaler.cls.xml)	(revision 43309)
+++ WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml	(.../VariantDescriptionBepaler.cls.xml)	(revision 43322)
@@ -22,29 +22,30 @@
 </Method>
 
 <Method name="Bepaal">
-<FormalSpec>Product:DOM.PM.Product</FormalSpec>
+<FormalSpec>Product:DOM.PM.Product,ConfigVariantId:AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRetailVariantId</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	#dim VariantDescriptionList As %ListOfObjects = ##class(%ListOfObjects).%New()
 	
-	Do VariantDescriptionList.Insert(..GeefVariantDescription(Product, ##class(DOM.enu.Taal).Nederlands()))
-	Do VariantDescriptionList.Insert(..GeefVariantDescription(Product, ##class(DOM.enu.Taal).Frans()))
-	Do VariantDescriptionList.Insert(..GeefVariantDescription(Product, ##class(DOM.enu.Taal).Engels()))
-	Do VariantDescriptionList.Insert(..GeefVariantDescription(Product, ##class(DOM.enu.Taal).Duits()))
+	Do VariantDescriptionList.Insert(..GeefVariantDescription(Product, ##class(DOM.enu.Taal).Nederlands(), ConfigVariantId))
+	Do VariantDescriptionList.Insert(..GeefVariantDescription(Product, ##class(DOM.enu.Taal).Frans(), ConfigVariantId))
+	Do VariantDescriptionList.Insert(..GeefVariantDescription(Product, ##class(DOM.enu.Taal).Engels(), ConfigVariantId))
+	Do VariantDescriptionList.Insert(..GeefVariantDescription(Product, ##class(DOM.enu.Taal).Duits(), ConfigVariantId))
 	
 	Quit VariantDescriptionList
 ]]></Implementation>
 </Method>
 
 <Method name="GeefVariantDescription">
-<FormalSpec>Product:DOM.PM.Product,Taal:DOM.enu.Taal</FormalSpec>
+<FormalSpec>Product:DOM.PM.Product,Taal:DOM.enu.Taal,ConfigVariantId:AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRetailVariantId</FormalSpec>
 <Private>1</Private>
 <ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityVariantDescription</ReturnType>
 <Implementation><![CDATA[
 	#dim VariantDescription As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityVariantDescription = ##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityVariantDescription).%New()
 	
 	Set VariantDescription.Description = Product.GeefLangtekst(Taal)
 	Set VariantDescription.LanguageId = ..Formatter.FormatLanguageId(Taal)
+	Set VariantDescription.ConfigVariantId = ConfigVariantId
 	
 	Quit VariantDescription
 ]]></Implementation>
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml
===================================================================
diff -u -r43309 -r43322
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml	(.../VariantDescriptionBepaler.cls.xml)	(revision 43309)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml	(.../VariantDescriptionBepaler.cls.xml)	(revision 43322)
@@ -9,9 +9,9 @@
 <Inheritance>right</Inheritance>
 
 <Method name="Bepaal">
-<FormalSpec>Product:DOM.PM.Product</FormalSpec>
+<FormalSpec>Product:DOM.PM.Product,ConfigVariantId:AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRetailVariantId</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("Bepaal",Product)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Bepaal",Product,ConfigVariantId)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/ProductData.cls.xml
===================================================================
diff -u -r43309 -r43322
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/ProductData.cls.xml	(.../ProductData.cls.xml)	(revision 43309)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/ProductData.cls.xml	(.../ProductData.cls.xml)	(revision 43322)
@@ -52,7 +52,7 @@
 	Do InterneFirmaBepalerStub.IndienMethodCall("Bepaal", ..RandomItemId).DanReturn(..DummyFirma)
 	
 	#dim VariantDescriptionBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-	Do VariantDescriptionBepalerStub.IndienMethodCall("Bepaal", ..ProductStub).DanReturn(##class(%ListOfObjects).%New())
+	Do VariantDescriptionBepalerStub.IndienMethodCall("Bepaal", ..ProductStub, ..RandomItemId).DanReturn(##class(%ListOfObjects).%New())
 	
 	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub, InterneFirmaBepalerStub, VariantDescriptionBepalerStub)
 ]]></Implementation>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r43309 -r43322
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43309)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43322)
@@ -38,7 +38,7 @@
 	Do InterneFirmaBepalerMock.VerwachtMethodCall("Bepaal", RandomItemId).DanReturn(DummyFirma)
 	
 	#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-	Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn(##class(%ListOfObjects).%New())
+	Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, RandomItemId).DanReturn(##class(%ListOfObjects).%New())
 	
 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiMock, InterneFirmaBepalerMock, VariantDescriptionBepalerMock)
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..DummyRequest, "RandomMessageId")