Index: vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml
===================================================================
diff -u -r43134 -r43139
--- vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml	(.../Test.cls.xml)	(revision 43134)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml	(.../Test.cls.xml)	(revision 43139)
@@ -9,7 +9,7 @@
 
 	Set OrderHoofdingConverteerder = ##class(AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder).%New()
 		
-	#dim OrderHeader as AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader = OrderHoofdingConverteerder.Converteer(Order)
+	#dim OrderHeader as AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader = OrderHoofdingConverteerder.Converteer(Order,"MessageId")
 	
 	do $$$AssertEquals(OrderHeader.ConfirmBody,"CommissieReferentie")
  	do $$$AssertEquals(OrderHeader.CurrencyCode,"EUR")
@@ -19,6 +19,7 @@
 	do $$$AssertEquals(OrderHeader.ReceiptDateRequested,"")
 	do $$$AssertEquals(OrderHeader.SalesIdAX,"AXSalesId")
 	do $$$AssertEquals(OrderHeader.class,"entity")
+	do $$$AssertEquals(OrderHeader.MessageId,"MessageId")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Mock/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml
===================================================================
diff -u -r42905 -r43139
--- vhTest/Mock/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 42905)
+++ vhTest/Mock/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 43139)
@@ -9,9 +9,9 @@
 <Inheritance>right</Inheritance>
 
 <Method name="Converteer">
-<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<FormalSpec>Order:DOM.VKP.Order,MessageId:%String</FormalSpec>
 <ReturnType>AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("Converteer",Order)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Converteer",Order,MessageId)
 ]]></Implementation>
 </Method>
 </Class>
Index: AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r43138 -r43139
--- AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 43138)
+++ AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 43139)
@@ -39,7 +39,7 @@
 	#dim Order as DOM.VKP.Order = ..OrderAPI.GeefOrder(Command.SubjectId)
 	
 	Set MessageParts = ##class(AXif.Dynamics.SalesOrderOut.MessageParts).%New()
-	Do MessageParts.MessagePart.OrderHeader.SetAt(..OrderHoofdingConverteerder.Converteer(Order),1)
+	Do MessageParts.MessagePart.OrderHeader.SetAt(..OrderHoofdingConverteerder.Converteer(Order,MessageId),1)
 	
 	#dim it as TECH.Iterator = Order.GeefOrderLijnIterator()
 	While it.HasNext() {
Index: AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml
===================================================================
diff -u -r42980 -r43139
--- AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 42980)
+++ AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 43139)
@@ -4,7 +4,7 @@
 <Super>TECH.Mockable</Super>
 
 <Method name="Converteer">
-<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<FormalSpec>Order:DOM.VKP.Order,MessageId:%String</FormalSpec>
 <ReturnType>AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader</ReturnType>
 <Implementation><![CDATA[
 	Set OrderHeader = ##class(AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader).%New()
@@ -16,6 +16,7 @@
 	Set OrderHeader.ReceiptDateRequested = ..GeefLeverDatumVanOrder(Order)
 	Set OrderHeader.SalesIdAX = Order.GeefAxSalesId()
 	Set OrderHeader.class = "entity"
+	Set OrderHeader.MessageId = MessageId
 	Quit OrderHeader
 ]]></Implementation>
 </Method>
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter/Test.cls.xml
===================================================================
diff -u -r42930 -r43139
--- vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 42930)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43139)
@@ -11,11 +11,11 @@
 	Do OrderAPI.VerwachtMethodCall("GeefOrder",1000).DanReturn(Order)
 	
 	Set OrderHoofdingConverteerderMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder).%New()
-	Do OrderHoofdingConverteerderMock.VerwachtMethodCall("Converteer",Order).DanDoeNiks()
+	Do OrderHoofdingConverteerderMock.VerwachtMethodCall("Converteer",Order,"MessageId").DanDoeNiks()
 	
 	Set SalesOrderConvertor = ##class(AXimpl.Dynamics.SalesOrderOut.Converter.SalesOrderConverter).%New(OrderAPI,OrderHoofdingConverteerderMock)		
 	
-	#dim Messageparts as AXif.Dynamics.SalesOrderOut.MessageParts = SalesOrderConvertor.Convert(..GeefRequest())
+	#dim Messageparts as AXif.Dynamics.SalesOrderOut.MessageParts = SalesOrderConvertor.Convert(..GeefRequest(),"MessageId")
 
 	Do OrderAPI.Verifieer()
 	Do OrderHoofdingConverteerderMock.Verifieer()
@@ -34,14 +34,14 @@
 	Do OrderAPI.VerwachtMethodCall("GeefOrder",1000).DanReturn(Order)
 	
 	Set OrderHoofdingConverteerderMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder).%New()
-	Do OrderHoofdingConverteerderMock.VerwachtMethodCall("Converteer",Order).DanDoeNiks()
+	Do OrderHoofdingConverteerderMock.VerwachtMethodCall("Converteer",Order,"MessageId").DanDoeNiks()
 	
 	Set OrderlijnConverteerderMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderOut.Converter.OrderlijnConverteerder).%New()
 	Do OrderlijnConverteerderMock.VerwachtMethodCall("Converteer",Orderlijn).DanDoeNiks()
 
 	Set SalesOrderConvertor = ##class(AXimpl.Dynamics.SalesOrderOut.Converter.SalesOrderConverter).%New(OrderAPI,OrderHoofdingConverteerderMock,OrderlijnConverteerderMock)		
 	
-	#dim Messageparts as AXif.Dynamics.SalesOrderOut.MessageParts = SalesOrderConvertor.Convert(..GeefRequest())
+	#dim Messageparts as AXif.Dynamics.SalesOrderOut.MessageParts = SalesOrderConvertor.Convert(..GeefRequest(),"MessageId")
 
 	Do OrderAPI.Verifieer()
 	Do OrderHoofdingConverteerderMock.Verifieer()