Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml
===================================================================
diff -u -r47151 -r47603
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml	(.../1765622.xml)	(revision 47151)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestSopr/1765622.xml	(.../1765622.xml)	(revision 47603)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>DummyInventTransId</ConfigVariantId>
+    <ConfigVariantId>{E3EA789A-9264-47DD-B005-E2B04FC1BDCE}</ConfigVariantId>
     <CostPrice>17.75</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml
===================================================================
diff -u -r47151 -r47603
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 47151)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 47603)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>DummyInventTransId</ConfigVariantId>
+    <ConfigVariantId>{3BFAA956-187C-4E76-94D1-8C97948675BD}</ConfigVariantId>
     <CostPrice>41.64</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: WSimpl/AX/CalculatedProduct/ProductService.cls.xml
===================================================================
diff -u
--- WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(revision 0)
+++ WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(revision 47603)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.AX.CalculatedProduct.ProductService">
+<Super>TECH.Mockable</Super>
+
+<Property name="ProductApi">
+<Type>DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ProductApi:DOM.PM.ProductAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefProduct">
+<FormalSpec>ProductId:%String="",IdentNummer:%String=""</FormalSpec>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[
+	If (ProductId = "") {
+		Set ProductId = ..ProductApi.GeefProductIdVoorIdentNummer(IdentNummer)
+	}
+	
+	Quit ..ProductApi.GeefProduct(ProductId)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/WSimpl/AX/CalculatedProduct/ProductService.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(revision 0)
+++ vhTest/Fake/WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(revision 47603)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WSimpl.AX.CalculatedProduct.ProductService">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.AX.CalculatedProduct.ProductService</Super>
+
+<Method name="GeefProduct">
+<FormalSpec>ProductId:%String="",IdentNummer:%String=""</FormalSpec>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml
===================================================================
diff -u -r47151 -r47603
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 47151)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 47603)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>DummyInventTransId</ConfigVariantId>
+    <ConfigVariantId>{CD771C81-3174-4349-B677-1259B870E1C9}</ConfigVariantId>
     <CostPrice>29.87</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml
===================================================================
diff -u -r47103 -r47603
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 47103)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 47603)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>DummyInventTransId</ConfigVariantId>
+    <ConfigVariantId>{E1E4A51D-49B1-48D9-A9A2-56D476CB9D39}</ConfigVariantId>
     <ErrorText>Product OnbestaandProduct bestaat niet!</ErrorText>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml
===================================================================
diff -u -r47151 -r47603
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 47151)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 47603)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>DummyInventTransId</ConfigVariantId>
+    <ConfigVariantId>{DFEB3291-9E93-421D-820A-70AECB8CD8A6}</ConfigVariantId>
     <CostPrice>28.77</CostPrice>
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r47103 -r47603
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 47103)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 47603)
@@ -3,8 +3,8 @@
 <Class name="WSimpl.AX.CalculatedProduct.RequestConverter">
 <Super>TECH.Mockable</Super>
 
-<Property name="ProductApi">
-<Type>DOM.PM.ProductAPI</Type>
+<Property name="ProductService">
+<Type>WSimpl.AX.CalculatedProduct.ProductService</Type>
 <Private>1</Private>
 </Property>
 
@@ -28,18 +28,24 @@
 <Private>1</Private>
 </Property>
 
+<Property name="MessageManager">
+<Type>AXimpl.MessageManager</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ProductApi:DOM.PM.ProductAPI="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter=""</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="",MessageManager:AXimpl.MessageManager=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
+	Set ..ProductService = $$$Inject(ProductService, ##class(WSimpl.AX.CalculatedProduct.ProductService).%New())
 	Set ..VariantDescriptionBepaler = $$$Inject(VariantDescriptionBepaler, ##class(WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New())
 	Set ..BouwstenenConverter = $$$Inject(BouwstenenConverter, ##class(WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New())
 	Set ..SourcingDataAreaIdBepaler = $$$Inject(SourcingDataAreaIdBepaler, ##class(WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New())
 	Set ..Formatter = $$$Inject(Formatter, ##class(AXimpl.Formatter).%New())
+	Set ..MessageManager = $$$Inject(MessageManager, ##class(AXimpl.MessageManager).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -54,7 +60,7 @@
 	Set ConfigVariant.MessageId = MessageId
 	Set ConfigVariant.RequestMessageId = Request.MessageId
 	Set ConfigVariant.ItemId = Request.ItemId
-	Set ConfigVariant.ConfigVariantId = Request.InventTransId
+	Set ConfigVariant.ConfigVariantId = ..MessageManager.GenerateID()
 	Set ConfigVariant.ConfigId = Request.ConfigId
 	Set ConfigVariant.SalesId = Request.SalesId
 	Set ConfigVariant.InventTransId = Request.InventTransId
@@ -72,25 +78,21 @@
 	}
 	
 	Try {
-		If (ProductId = "") {
-			Set ProductId = ..ProductApi.GeefProductIdVoorIdentNummer(Request.ItemId)
-		}
-		
-		Set Product = ..ProductApi.GeefProduct(ProductId)
-			
-		If $$$Not(ProductId = "") {
-			Set ConfigVariant.GTIN = Product.GeefEANCode()
-			Set ConfigVariant.ProductName = Product.GeefKorttekst()
-			Set ConfigVariant.CostPrice = ..Formatter.FormatNumber(Product.GeefNettoAankoopPrijsInclCif(), 2)
-			Set ConfigVariant.VariantDescription = ..VariantDescriptionBepaler.Bepaal(Product, ConfigVariant.ConfigVariantId)
-			Set ConfigVariant.BOMLine = ..BouwstenenConverter.Convert(Product, ConfigVariant.ConfigVariantId)
-			Set ConfigVariant.SourcingDataAreaId = ..SourcingDataAreaIdBepaler.Bepaal(Product)
-		}
+		Set Product = ..ProductService.GeefProduct(ProductId, Request.ItemId)
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		
 		Set ConfigVariant.ErrorText = Exception.GeefOmschrijving()
 	}
+				
+	If $IsObject(Product) {
+		Set ConfigVariant.GTIN = Product.GeefEANCode()
+		Set ConfigVariant.ProductName = Product.GeefKorttekst()
+		Set ConfigVariant.CostPrice = ..Formatter.FormatNumber(Product.GeefNettoAankoopPrijsInclCif(), 2)
+		Set ConfigVariant.VariantDescription = ..VariantDescriptionBepaler.Bepaal(Product, ConfigVariant.InventTransId)
+		Set ConfigVariant.BOMLine = ..BouwstenenConverter.Convert(Product, ConfigVariant.InventTransId)
+		Set ConfigVariant.SourcingDataAreaId = ..SourcingDataAreaIdBepaler.Bepaal(Product)
+	}
 	
 	Quit ConfigVariant
 ]]></Implementation>
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductService.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(revision 0)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(revision 47603)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.AX.CalculatedProduct.ProductService,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefProduct">
+<FormalSpec>ProductId:%String="",IdentNummer:%String=""</FormalSpec>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProduct",ProductId,IdentNummer)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml	(revision 47603)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.AX.CalculatedProduct.ProductService.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Product wordt opgevraagd aan ProductApi">
+<Implementation><![CDATA[
+	#dim RandomProductId As %String = "RandomProductId"
+	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
+	
+	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.VerwachtMethodCall("GeefProduct", RandomProductId).DanReturn(ProductDummy)
+	
+	#dim ProductService As WSimpl.AX.CalculatedProduct.ProductService = ##class(WSimpl.AX.CalculatedProduct.ProductService).%New(ProductApiMock)
+	#dim Product As DOM.PM.Product = ProductService.GeefProduct(RandomProductId)
+	
+	Do $$$AssertEquals(Product, ProductDummy)
+	
+	Do ProductApiMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Product wordt opgehaald op basis van IdentNummer indien geen ProductId opgegeven">
+<Implementation><![CDATA[
+	#dim RandomIdentNummer As %String = "RandomIdentNummer"
+	#dim RandomProductId As %String = "RandomProductId"
+	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
+	
+	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiMock.VerwachtMethodCall("GeefProductIdVoorIdentNummer", RandomIdentNummer).DanReturn(RandomProductId)
+	Do ProductApiMock.VerwachtMethodCall("GeefProduct", RandomProductId).DanReturn(ProductDummy)
+	
+	#dim ProductService As WSimpl.AX.CalculatedProduct.ProductService = ##class(WSimpl.AX.CalculatedProduct.ProductService).%New(ProductApiMock)
+	#dim Product As DOM.PM.Product = ProductService.GeefProduct("", RandomIdentNummer)
+	
+	Do $$$AssertEquals(Product, ProductDummy)
+	
+	Do ProductApiMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml
===================================================================
diff -u -r47151 -r47603
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 47151)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 47603)
@@ -2,7 +2,7 @@
 <AxdADUMsgBOMBOLInQuery xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgBOMBOLInQuery">
   <ConfigVariant class="entity">
     <ConfigId>DummyConfigId</ConfigId>
-    <ConfigVariantId>DummyInventTransId</ConfigVariantId>
+    <ConfigVariantId>{274096DC-13A4-4F5B-89DE-B47EB2A6B01D}</ConfigVariantId>
     <CostPrice>40.30</CostPrice>
     <GTIN>5415001000198</GTIN>
     <InventTransId>DummyInventTransId</InventTransId>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r47485 -r47603
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47485)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47603)
@@ -3,163 +3,164 @@
 <Class name="vhUnitTest.WSimpl.AX.CalculatedProduct.RequestConverter.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="RandomProductId">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="RequestMetAdminProductNummer">
-<Type>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	
-	Set ..RandomProductId = "RandomProductId"
-	Set ..RequestMetAdminProductNummer = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	
-	Do ..RequestMetAdminProductNummer.Attribute.Insert(..MaakAttribute("AdminProductNummer", ..RandomProductId))
-]]></Implementation>
-</Method>
-
 <Method name="Test: RequestConverter converteert een AxdEntityRequest naar een AxdEntityConfigVariant">
 <Implementation><![CDATA[
-	#dim RandomItemId As %String = "RandomItemId"
-	#dim RandomInventTransId As %String = "RandomInventTransId"
+	#dim RandomProductId As %String = "RandomProductId"
 	#dim RandomNettoAankoopPrijs As %String = "RandomNettoAankoopPrijs"
 	
-	Set ..RequestMetAdminProductNummer.ItemId = RandomItemId
-	Set ..RequestMetAdminProductNummer.InventTransId = RandomInventTransId
-	
 	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-	Do ProductStub.IndienMethodCall("GeefEANCode")
-	Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..RandomProductId)
-	Do ProductStub.IndienMethodCall("GeefKorttekst")
+	Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn("RandomEANCode")
+	Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn("RandomKorttekst")
 	Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(RandomNettoAankoopPrijs)
 	
-	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..RandomProductId).DanReturn(ProductStub)
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(RandomProductId)
 	
+	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", RandomProductId, Request.ItemId).DanReturn(ProductStub)
+	
 	#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-	Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, RandomInventTransId).DanReturn(##class(%ListOfObjects).%New())
+	Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.InventTransId).DanReturn(##class(%ListOfObjects).%New())
 	
 	#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-	Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, RandomInventTransId).DanReturn(##class(%ListOfObjects).%New())
+	Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.InventTransId).DanReturn(##class(%ListOfObjects).%New())
 	
 	#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
 	Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn("RandomSourcingDataAreaId")
 	
 	#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
 	Do FormatterMock.VerwachtMethodCall("FormatNumber", RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
 	
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..RequestMetAdminProductNummer, "RandomMessageId")
+	#dim MessageManagerMock As vhTest.Mock.AXimpl.MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
+	Do MessageManagerMock.VerwachtMethodCall("GenerateID").DanReturn("RandomGUID")
 	
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, MessageManagerMock)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
+	
 	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
 	
 	Do BouwstenenConverterMock.Verifieer()
 	Do VariantDescriptionBepalerMock.Verifieer()
-	Do ProductApiMock.Verifieer()
+	Do ProductServiceMock.Verifieer()
 	Do SourcingDataAreaIdBepalerMock.Verifieer()
 	Do FormatterMock.Verifieer()
+	Do MessageManagerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: RequestConverter vult ErrorText in indien een exceptie geraised wordt bij het ophalen van het Product">
 <Implementation><![CDATA[
 	#dim RandomExceptionMessage As %String = "RandomExceptionMessage"
-	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("GeefProductIdVoorIdentNummer", $$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New(RandomExceptionMessage))
 	
+	#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New(RandomExceptionMessage))
+	
 	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub)
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(DummyRequest, "RandomMessageId")
 	
 	Do $$$AssertEquals(ConfigVariant.ErrorText, RandomExceptionMessage)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: RequestConverter vult MessageId altijd in">
+<Method name="Test: RequestConverter vult velden altijd in">
 <Implementation><![CDATA[
-	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
-	Do ProductApiStub.IndienMethodCall("BestaatIdentNr", $$$ElkeWaarde).DanReturn($$$False)
-	
 	#dim RandomMessageId As %String = "RandomMessageId"
-	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(DummyRequest, RandomMessageId)
+	#dim RandomGUID As %String = "RandomGUID"
 	
+	#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
+	
+	#dim MessageManagerStub As vhTest.Mock.AXimpl.MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
+	Do MessageManagerStub.IndienMethodCall("GenerateID").DanReturn(RandomGUID)
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest("RandomProductId")
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub, "", "", "", "", MessageManagerStub)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, RandomMessageId)
+	
 	Do $$$AssertEquals(ConfigVariant.MessageId, RandomMessageId)
+	Do $$$AssertEquals(ConfigVariant.RequestMessageId, Request.MessageId)
+	Do $$$AssertEquals(ConfigVariant.ItemId, Request.ItemId)
+	Do $$$AssertEquals(ConfigVariant.ConfigVariantId, RandomGUID)
+	Do $$$AssertEquals(ConfigVariant.ConfigId, Request.ConfigId)
+	Do $$$AssertEquals(ConfigVariant.SalesId, Request.SalesId)
+	Do $$$AssertEquals(ConfigVariant.InventTransId, Request.InventTransId)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: RequestConverter laat velden leeg">
+<Method name="Test: RequestConverter vult velden in op basis van het gevonden Product">
 <Implementation><![CDATA[
-	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()	
+	#dim RandomEANCode As %String = "RandomEANCode"
+	#dim RandomKorttekst As %String = "RandomKorttekst"
+	#dim RandomNettoAankoopPrijs As %String = "RandomNettoAankoopPrijs"	
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(RandomEANCode)
+	Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(RandomKorttekst)
+	Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(RandomNettoAankoopPrijs)
+
+	#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(ProductStub)
 	
-	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("BestaatProduct", ..RandomProductId).DanReturn($$$True)
-	Do ProductApiStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde).DanReturn(ProductDummy)
+	#dim RandomVariantDescription As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("RandomLangtekst1", "RandomLangtekst2")
+	#dim VariantDescriptionBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
+	Do VariantDescriptionBepalerStub.IndienMethodCall("Bepaal", ProductStub, $$$ElkeWaarde).DanReturn(RandomVariantDescription)
 	
+	#dim RandomBouwstenen As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("RandomBouwsteen1", "RandomBouwsteen2")
+	#dim BouwstenenConverterStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
+	Do BouwstenenConverterStub.IndienMethodCall("Convert", ProductStub, $$$ElkeWaarde).DanReturn(RandomBouwstenen)
+	
+	#dim RandomSourcingDataAreaId As %String = "RandomSourcingDataAreaId"
 	#dim SourcingDataAreaIdBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-	Do SourcingDataAreaIdBepalerStub.IndienMethodCall("Bepaal", $$$ElkeWaarde).DanReturn("RandomSourcingDataAreaId")		
+	Do SourcingDataAreaIdBepalerStub.IndienMethodCall("Bepaal", ProductStub).DanReturn(RandomSourcingDataAreaId)
 	
-	#dim RandomMessageId As %String = "RandomMessageId"
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub, "", "", SourcingDataAreaIdBepalerStub)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..RequestMetAdminProductNummer, RandomMessageId)
+	#dim GeformatteerdeNettoAankoopPrijs As %String = "GeformatteerdeNettoAankoopPrijs"
+	#dim FormatterStub As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
+	Do FormatterStub.IndienMethodCall("FormatNumber", RandomNettoAankoopPrijs, 2).DanReturn(GeformatteerdeNettoAankoopPrijs)
 	
-	Do $$$AssertEquals(ConfigVariant.SourcingRouteId, "")
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest("RandomProductId")
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub, VariantDescriptionBepalerStub, BouwstenenConverterStub, SourcingDataAreaIdBepalerStub, FormatterStub)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
+	
+	Do $$$AssertEquals(ConfigVariant.GTIN, RandomEANCode)
+	Do $$$AssertEquals(ConfigVariant.ProductName, RandomKorttekst)
+	Do $$$AssertEquals(ConfigVariant.CostPrice, GeformatteerdeNettoAankoopPrijs)
+	Do $$$AssertEqualsList(ConfigVariant.VariantDescription, RandomVariantDescription)
+	Do $$$AssertEqualsList(ConfigVariant.BOMLine, RandomBouwstenen)
+	Do $$$AssertEquals(ConfigVariant.SourcingDataAreaId, RandomSourcingDataAreaId)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: RequestConverter haalt Product op op basis van IdentNr indien geen AdminProductNummer is opgegeven">
+<Method name="Test: RequestConverter laat velden leeg">
 <Implementation><![CDATA[
-	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
-	#dim RandomIdentNr As %String = "RandomIdentNr"
+	#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(##class(vhTest.Dummy.DOM.PM.Product).%New())
 	
-	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	Set Request.ItemId = RandomIdentNr
-	
-	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiMock.VerwachtMethodCall("GeefProductIdVoorIdentNummer", RandomIdentNr).DanReturn(ProductDummy)
-
 	#dim SourcingDataAreaIdBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
 	Do SourcingDataAreaIdBepalerStub.IndienMethodCall("Bepaal", $$$ElkeWaarde).DanReturn("RandomSourcingDataAreaId")		
 	
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiMock, "", "", SourcingDataAreaIdBepalerStub)
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest("RandomProductId")
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub, "", "", SourcingDataAreaIdBepalerStub)
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 	
-	Do ProductApiMock.Verifieer()
+	Do $$$AssertEquals(ConfigVariant.SourcingRouteId, "")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: RequestConverter vult SourcingDataAreaId in met waarde bepaald door SourcingDataAreaIdBepaler">
+<Method name="MaakRequest">
+<FormalSpec>ProductId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</ReturnType>
 <Implementation><![CDATA[
-	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
-	#dim RandomIdentNr As %String = "RandomIdentNr"
-	#dim RandomSourcingDataAreaId As %String = "RandomSourcingDataAreaId"
-	
 	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	Set Request.ItemId = RandomIdentNr
 	
-	#dim RandomProductId As %String = "RandomProductId"
-	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.VerwachtMethodCall("GeefProductIdVoorIdentNummer", RandomIdentNr).DanReturn(RandomProductId)
-	Do ProductApiStub.IndienMethodCall("GeefProduct", RandomProductId).DanReturn(ProductDummy)
+	Set Request.ItemId = "RandomRequestItemId"
+	Set Request.ConfigId = "RandomRequestConfigId"
+	Set Request.SalesId = "RandomRequestSalesId"
+	Set Request.InventTransId = "RandomRequestInventTransId"
+	Set Request.MessageId = "RandomRequestMessageId"
 	
-	#dim SourcingDataAreaIdBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-	Do SourcingDataAreaIdBepalerStub.IndienMethodCall("Bepaal", $$$ElkeWaarde).DanReturn(RandomSourcingDataAreaId)		
+	Do Request.Attribute.Insert(..MaakAttribute("AdminProductNummer", ProductId))
 	
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub, "", "", SourcingDataAreaIdBepalerStub) //ProductApiStub, "", "", SourcingDataAreaIdBepalerStub)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
-	
-	Do $$$AssertEquals(ConfigVariant.SourcingDataAreaId, RandomSourcingDataAreaId)
-	
-	Do ProductApiStub.Verifieer()
+	Quit Request
 ]]></Implementation>
 </Method>
 
FishEye: Tag 47603 refers to a dead (removed) revision in file `vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/ProductData.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 47603 refers to a dead (removed) revision in file `vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?