Index: AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r42899 -r42905
--- AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 42899)
+++ AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 42905)
@@ -8,14 +8,20 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OrderHoofdingConverteerder">
+<Type>AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>OrderAPI:DOM.VKP.OrderAPI</FormalSpec>
+<FormalSpec>OrderAPI:DOM.VKP.OrderAPI,OrderHoofdingConverteerder:AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..OrderAPI = $$$Inject(OrderAPI,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
+	Set ..OrderHoofdingConverteerder = $$$Inject(OrderHoofdingConverteerder,##class(AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -27,7 +33,7 @@
 	#dim Order as DOM.VKP.Order = ..OrderAPI.GeefOrder(Command.SubjectId)
 	
 	Set MessageParts = ##class(AXif.Dynamics.SalesOrderOut.MessageParts).%New()
-	Do MessageParts.ADUMsgSalesOrderInQuery.OrderHeader.SetAt(..ConverteerOrderHoofding(Order),1)
+	Do MessageParts.ADUMsgSalesOrderInQuery.OrderHeader.SetAt(..OrderHoofdingConverteerder.Converteer(Order),1)
 	
 	#dim it as TECH.Iterator = Order.GeefOrderLijnIterator()
 	While it.HasNext() {
@@ -64,31 +70,6 @@
 	Quit AxOrderLine
 ]]></Implementation>
 </Method>
-
-<Method name="ConverteerOrderHoofding">
-<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
-<Private>1</Private>
-<ReturnType>AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader</ReturnType>
-<Implementation><![CDATA[
-	Set OrderHeader = ##class(AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader).%New()
-	Set OrderHeader.ConfirmBody = Order.GeefCommissieReferentie()
-	Set OrderHeader.CurrencyCode = "EUR"
-	Set OrderHeader.CustAccount = ##class(AXimpl.AdminToAxUtils).ConvertCustomerID(Order.GeefKlantID())
-	Set OrderHeader.CustomerRef = Order.GeefOrderReferentie()
-	Set OrderHeader.InvoiceAccount = OrderHeader.CustAccount
-	Set OrderHeader.ReceiptDateRequested = ..GeefLeverDatumVanOrder(Order)
-	Set OrderHeader.SalesIdAX = Order.GeefAxSalesId()
-	Quit OrderHeader
-]]></Implementation>
-</Method>
-
-<Method name="GeefLeverDatumVanOrder">
-<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	quit ""
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Mock/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml
===================================================================
diff -u
--- vhTest/Mock/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(revision 0)
+++ vhTest/Mock/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(revision 42905)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder">
+<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>AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Converteer">
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<ReturnType>AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Converteer",Order)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml
===================================================================
diff -u
--- vhTest/Fake/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(revision 0)
+++ vhTest/Fake/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(revision 42905)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder">
+<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>AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder</Super>
+
+<Method name="Converteer">
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<ReturnType>AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml
===================================================================
diff -u
--- AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(revision 0)
+++ AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(revision 42905)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder">
+<Super>TECH.Mockable</Super>
+
+<Method name="Converteer">
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<ReturnType>AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader</ReturnType>
+<Implementation><![CDATA[
+	Set OrderHeader = ##class(AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader).%New()
+	Set OrderHeader.ConfirmBody = Order.GeefCommissieReferentie()
+	Set OrderHeader.CurrencyCode = "EUR"
+	Set OrderHeader.CustAccount = ##class(AXimpl.AdminToAxUtils).ConvertCustomerID(Order.GeefKlantID())
+	Set OrderHeader.CustomerRef = Order.GeefOrderReferentie()
+	Set OrderHeader.InvoiceAccount = OrderHeader.CustAccount
+	Set OrderHeader.ReceiptDateRequested = ..GeefLeverDatumVanOrder(Order)
+	Set OrderHeader.SalesIdAX = Order.GeefAxSalesId()
+	Quit OrderHeader
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverDatumVanOrder">
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[	quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>