Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml
===================================================================
diff -u -r44930 -r44962
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 44930)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 44962)
@@ -9,6 +9,7 @@
     <ItemId>DummyItemId</ItemId>
     <MessageId>DummyMessageId</MessageId>
     <ProductName>OO.VLFV30INVLAKVERD</ProductName>
+    <RequestMessageId>DummyRequestMessageId</RequestMessageId>
     <SalesId>DummySalesId</SalesId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r44777 -r44962
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 44777)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 44962)
@@ -40,7 +40,7 @@
 	#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
 	Set ConfigVariant.ConfigVariantId = Request.ItemId
 	Set ConfigVariant.ConfigId = Request.ConfigId
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml
===================================================================
diff -u -r44930 -r44962
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 44930)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 44962)
@@ -8,6 +8,7 @@
     <ItemId>DummyItemId</ItemId>
     <MessageId>DummyMessageId</MessageId>
     <ProductName>LB4M/E ABAC500x564 X SWWI</ProductName>
+    <RequestMessageId>DummyRequestMessageId</RequestMessageId>
     <SalesId>DummySalesId</SalesId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml
===================================================================
diff -u -r44930 -r44962
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 44930)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 44962)
@@ -8,6 +8,7 @@
     <ItemId>DummyItemId</ItemId>
     <MessageId>DummyMessageId</MessageId>
     <ProductName>TB8MAI.A45F500x564   TSBZ</ProductName>
+    <RequestMessageId>DummyRequestMessageId</RequestMessageId>
     <SalesId>DummySalesId</SalesId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
FishEye: Tag 42919 refers to a dead (removed) revision in file `AXif/Dynamics/CalculatedProductIn/MessageParts/AxdTypeGUID.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml
===================================================================
diff -u -r44930 -r44962
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 44930)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 44962)
@@ -8,6 +8,7 @@
     <ItemId>DummyItemId</ItemId>
     <MessageId>DummyMessageId</MessageId>
     <ProductName>TA4M/E CDRR500x564    W W</ProductName>
+    <RequestMessageId>DummyRequestMessageId</RequestMessageId>
     <SalesId>DummySalesId</SalesId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
Index: AXif/Dynamics/CalculatedProductOut/MessageParts.cls.xml
===================================================================
diff -u -r44751 -r44962
--- AXif/Dynamics/CalculatedProductOut/MessageParts.cls.xml	(.../MessageParts.cls.xml)	(revision 44751)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts.cls.xml	(.../MessageParts.cls.xml)	(revision 44962)
@@ -42,6 +42,8 @@
 <State>MessagePartsState</State>
 <StreamLocation>^AXif.DynamicsEC06.MessagePartsS</StreamLocation>
 <Data name="MessagePartsState">
+<Structure>listnode</Structure>
+<Subscript/>
 <Value name="1">
 <Value>MessagePart</Value>
 </Value>
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityConfigVariant.cls.xml
===================================================================
diff -u -r44899 -r44962
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityConfigVariant.cls.xml	(.../AxdEntityConfigVariant.cls.xml)	(revision 44899)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityConfigVariant.cls.xml	(.../AxdEntityConfigVariant.cls.xml)	(revision 44962)
@@ -60,7 +60,6 @@
 
 <Property name="GTIN">
 <Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeGlobalTradeItemNumber</Type>
-<Required>1</Required>
 <Parameter name="XMLNAME" value="GTIN"/>
 </Property>
 
@@ -94,6 +93,11 @@
 <Parameter name="XMLNAME" value="ProductName"/>
 </Property>
 
+<Property name="RequestMessageId">
+<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeAifMessageBase</Type>
+<Parameter name="XMLNAME" value="RequestMessageId"/>
+</Property>
+
 <Property name="SalesId">
 <Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeSalesId</Type>
 <Parameter name="XMLNAME" value="SalesId"/>
@@ -198,30 +202,33 @@
 <Value>ProductName</Value>
 </Value>
 <Value name="14">
-<Value>SalesId</Value>
+<Value>RequestMessageId</Value>
 </Value>
 <Value name="15">
-<Value>SourcingDataAreaId</Value>
+<Value>SalesId</Value>
 </Value>
 <Value name="16">
-<Value>SourcingRouteId</Value>
+<Value>SourcingDataAreaId</Value>
 </Value>
 <Value name="17">
-<Value>BOMLine</Value>
+<Value>SourcingRouteId</Value>
 </Value>
 <Value name="18">
-<Value>VariantDescription</Value>
+<Value>BOMLine</Value>
 </Value>
 <Value name="19">
-<Value>RouteOpr</Value>
+<Value>VariantDescription</Value>
 </Value>
 <Value name="20">
-<Value>Attribute</Value>
+<Value>RouteOpr</Value>
 </Value>
 <Value name="21">
-<Value>class</Value>
+<Value>Attribute</Value>
 </Value>
 <Value name="22">
+<Value>class</Value>
+</Value>
+<Value name="23">
 <Value>action</Value>
 </Value>
 </Data>
Index: AXif/Dynamics/CalculatedProductIn/MessageParts.cls.xml
===================================================================
diff -u -r44751 -r44962
--- AXif/Dynamics/CalculatedProductIn/MessageParts.cls.xml	(.../MessageParts.cls.xml)	(revision 44751)
+++ AXif/Dynamics/CalculatedProductIn/MessageParts.cls.xml	(.../MessageParts.cls.xml)	(revision 44962)
@@ -42,6 +42,8 @@
 <State>MessagePartsState</State>
 <StreamLocation>^AXif.Dynamics2C59.MessagePartsS</StreamLocation>
 <Data name="MessagePartsState">
+<Structure>listnode</Structure>
+<Subscript/>
 <Value name="1">
 <Value>MessagePart</Value>
 </Value>
Index: vhTest/Integratie/WSimpl/AX/CalculatedProduct/TestBase.cls.xml
===================================================================
diff -u -r44768 -r44962
--- vhTest/Integratie/WSimpl/AX/CalculatedProduct/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 44768)
+++ vhTest/Integratie/WSimpl/AX/CalculatedProduct/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 44962)
@@ -60,6 +60,7 @@
 	Set Request.ItemId = "DummyItemId"
 	Set Request.Qty = "DummyQty"
 	Set Request.SalesId = "DummySalesId"
+	Set Request.MessageId = "DummyRequestMessageId"
 	
 	Quit Request
 ]]></Implementation>
FishEye: Tag 42919 refers to a dead (removed) revision in file `AXif/Dynamics/CalculatedProductIn/MessageParts/AxdExtTypeAifMessageBase.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEntityRequest.cls.xml
===================================================================
diff -u -r44899 -r44962
--- AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEntityRequest.cls.xml	(.../AxdEntityRequest.cls.xml)	(revision 44899)
+++ AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEntityRequest.cls.xml	(.../AxdEntityRequest.cls.xml)	(revision 44962)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest">
 <ClassType>serial</ClassType>
-<CompileAfter>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEnumAxdEntityAction,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeEcoResConfigurationName,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeInventTransId,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeItemIdSmall,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeQty,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeSalesId,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeTransDate,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdUnionAxdExtTypeCustAccountAxdTypeExtCodeValue</CompileAfter>
+<CompileAfter>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEnumAxdEntityAction,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeAifMessageBase,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeEcoResConfigurationName,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeInventTransId,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeItemIdSmall,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeQty,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeSalesId,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeTransDate,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdUnionAxdExtTypeCustAccountAxdTypeExtCodeValue</CompileAfter>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%SerialObject,%XML.Adaptor</Super>
 <Inheritance>right</Inheritance>
@@ -53,6 +53,11 @@
 <Parameter name="XMLNAME" value="ItemId"/>
 </Property>
 
+<Property name="MessageId">
+<Type>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeAifMessageBase</Type>
+<Parameter name="XMLNAME" value="MessageId"/>
+</Property>
+
 <Property name="Qty">
 <Type>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeQty</Type>
 <Parameter name="XMLNAME" value="Qty"/>
@@ -112,21 +117,24 @@
 <Value>ItemId</Value>
 </Value>
 <Value name="6">
-<Value>Qty</Value>
+<Value>MessageId</Value>
 </Value>
 <Value name="7">
-<Value>SalesId</Value>
+<Value>Qty</Value>
 </Value>
 <Value name="8">
-<Value>TransDate</Value>
+<Value>SalesId</Value>
 </Value>
 <Value name="9">
-<Value>Attribute</Value>
+<Value>TransDate</Value>
 </Value>
 <Value name="10">
-<Value>class</Value>
+<Value>Attribute</Value>
 </Value>
 <Value name="11">
+<Value>class</Value>
+</Value>
+<Value name="12">
 <Value>action</Value>
 </Value>
 </Data>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml
===================================================================
diff -u -r43682 -r44962
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml	(.../RequestData.cls.xml)	(revision 43682)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml	(.../RequestData.cls.xml)	(revision 44962)
@@ -20,14 +20,16 @@
 	#dim RandomItemId As %String = "RandomItemId"
 	#dim RandomConfigId As %String = "RandomConfigId"
 	#dim RandomSalesId As %String = "RandomSalesId"
-	#dim RandomInventTransId As %String = "RandomInventTransId"	
+	#dim RandomInventTransId As %String = "RandomInventTransId"
+	#dim RandomRequestMessageId As %String = "RandomRequestMessageId"
 	
 	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	
 	Set DummyRequest.ItemId = RandomItemId
 	Set DummyRequest.ConfigId = RandomConfigId
 	Set DummyRequest.SalesId = RandomSalesId
 	Set DummyRequest.InventTransId = RandomInventTransId
+	Set DummyRequest.MessageId = RandomRequestMessageId
 	
 	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
 	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
@@ -46,6 +48,7 @@
 	Do $$$AssertEquals(ConfigVariant.ConfigId, RandomConfigId)
 	Do $$$AssertEquals(ConfigVariant.SalesId, RandomSalesId)
 	Do $$$AssertEquals(ConfigVariant.InventTransId, RandomInventTransId)
+	Do $$$AssertEquals(ConfigVariant.RequestMessageId, RandomRequestMessageId)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml
===================================================================
diff -u -r44930 -r44962
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 44930)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOnbestaandProduct/OnbestaandProduct.xml	(.../OnbestaandProduct.xml)	(revision 44962)
@@ -7,6 +7,7 @@
     <InventTransId>DummyInventTransId</InventTransId>
     <ItemId>DummyItemId</ItemId>
     <MessageId>DummyMessageId</MessageId>
+    <RequestMessageId>DummyRequestMessageId</RequestMessageId>
     <SalesId>DummySalesId</SalesId>
   </ConfigVariant>
 </AxdADUMsgBOMBOLInQuery>
\ No newline at end of file