Index: vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r42660 -r54932
--- vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 42660)
+++ vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 54932)
@@ -8,6 +8,13 @@
 <Super>AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="%OnNew">
+<FormalSpec>OrderAPI:DOM.VKP.OrderAPI,OrderLevenCyclusService:APPS.VKP.OrderLevenCyclusService,DateTimeAPI:TECH.DateTime.DateTimeAPI="",ProductBepaler:AXimpl.Admin.Common.ProductBepaler,DocumentReferentiesRepository:DOM.VKP.DocumentReferentiesRepository,OrderlijnenSorteerder:AXimpl.Dynamics.SalesOrderIn.Converter.OrderlijnenSorteerder,OrderSluiter:CHUI.VKP.OrderIngave.BevestigdAXOrderSluiterv01,ToeleveringService:AXimpl.Dynamics.SalesOrderIn.Converter.ToeleveringService,OrderIngaveService:APPS.VKP.OrderIngaveService,OfferteRepository:APPS.VKP.Offerte.OfferteRepository,SalesOrderLineStatusRepository:AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository,VerkoopApi:DOM.VKP.VerkoopAPI,Mailer:AXimpl.Dynamics.SalesOrderIn.Converter.Mailer,LeverAdresMaker:AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Convert">
 <FormalSpec>Message:AXif.Dynamics.SalesOrderIn.Envelope</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("Convert",Message)
Index: DOM/VKP/impl/DataM/DataMOrder.cls.xml
===================================================================
diff -u -r54464 -r54932
--- DOM/VKP/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 54464)
+++ DOM/VKP/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 54932)
@@ -518,20 +518,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefBeloofdeLeverdatum">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..HoofdingData.GeefPiece(16)
-]]></Implementation>
-</Method>
-
-<Method name="ZetBeloofdeLeverdatum">
-<FormalSpec>Value:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ..HoofdingData.ZetPiece(16,Value)
-	Do ..%SetModified(1)
-]]></Implementation>
-</Method>
-
 <Method name="GeefOrderLijnIterator">
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml
===================================================================
diff -u -r54464 -r54932
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 54464)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 54932)
@@ -34,7 +34,6 @@
 	Do OrderMock.VerwachtMethodCall("ZetDocumentReferenties", OrderDocRef).ExactAantalKeer(1)
 	Do OrderMock.VerwachtMethodCall("GeefDocumentReferenties").DanReturn("")
 	Do OrderMock.VerwachtMethodCall("ZetCreatieDatum", $$INTDATE^vhLib.DataTypes("18-07-2017")).ExactAantalKeer(1)
-	Do OrderMock.VerwachtMethodCall("ZetBeloofdeLeverdatum", "18.07.17").ExactAantalKeer(1)
 	Do OrderMock.VerwachtMethodCall("ZetMunt", "EUR").ExactAantalKeer(1)
 	Do OrderMock.VerwachtMethodCall("ZetEDINummer", "VO1600010000").ExactAantalKeer(1)
 	Do OrderMock.VerwachtMethodCall("ZetLeveringVoorwaarde", "00").ExactAantalKeer(1)
Index: vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml
===================================================================
diff -u -r54098 -r54932
--- vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 54098)
+++ vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 54932)
@@ -20,7 +20,6 @@
 	Set OrderHeader.CreatedDateTimeHeader = ##class(AXif.Dynamics.SalesOrderIn.MessageParts.AxdExtTypeCreatedDateTime).%New()
 	Set OrderHeader.CreatedDateTimeHeader.content = ##class(TECH.DateTime).HorologToTimeStamp("64482,43844")
 	Set OrderHeader.CreatedDateTimeHeader.localDateTime = "2018-01-05T13:41:04"
-	Set OrderHeader.ReceiptDateConfirmed = 64482
 	Set OrderHeader.CurrencyCode = "EUR"
 	Set OrderHeader.RefSalesOriginId = "VO1600010000"
 	Set OrderHeader.SalesId = "VO1600010000"
Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r54464 -r54932
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 54464)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 54932)
@@ -513,8 +513,6 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	Do Order.ZetCreatieDatum(..MaakCreatieDatum(OrderHeader))
-	
-	Do Order.ZetBeloofdeLeverdatum(##class(TECH.DateTime).GeefDatumInPuntNotatie(OrderHeader.ReceiptDateConfirmed))
 	Do Order.ZetMunt(OrderHeader.CurrencyCode)
 	Do Order.ZetEDINummer(OrderHeader.RefSalesOriginId)
 	Do Order.ZetLeveringVoorwaarde(..MaakLeveringVoorwaarde(OrderHeader))
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Base.cls.xml
===================================================================
diff -u -r54025 -r54932
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Base.cls.xml	(.../Base.cls.xml)	(revision 54025)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Base.cls.xml	(.../Base.cls.xml)	(revision 54932)
@@ -67,7 +67,6 @@
 	Do OrderMock.IndienMethodCall("ZetDocumentReferenties", $$$ElkeWaarde).DanDoeNiks()
 	Do OrderMock.IndienMethodCall("GeefDocumentReferenties").DanReturn("")
 	Do OrderMock.IndienMethodCall("ZetCreatieDatum", $$$ElkeWaarde).DanDoeNiks()
-	Do OrderMock.IndienMethodCall("ZetBeloofdeLeverdatum", $$$ElkeWaarde).DanDoeNiks()
 	Do OrderMock.IndienMethodCall("ZetMunt", $$$ElkeWaarde).DanDoeNiks()
 	Do OrderMock.IndienMethodCall("ZetEDINummer", $$$ElkeWaarde).DanDoeNiks()
 	Do OrderMock.IndienMethodCall("ZetLeveringVoorwaarde", $$$ElkeWaarde).DanDoeNiks()
Index: DOM/VKP/Order.cls.xml
===================================================================
diff -u -r54464 -r54932
--- DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 54464)
+++ DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 54932)
@@ -273,16 +273,6 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="GeefBeloofdeLeverdatum">
-<Abstract>1</Abstract>
-<ReturnType>%String</ReturnType>
-</Method>
-
-<Method name="ZetBeloofdeLeverdatum">
-<Abstract>1</Abstract>
-<FormalSpec>Value:%String</FormalSpec>
-</Method>
-
 <Method name="IsGelinktAanToelevering">
 <Abstract>1</Abstract>
 <ReturnType>%Boolean</ReturnType>
Index: vhTest/Mock/DOM/VKP/Order.cls.xml
===================================================================
diff -u -r54464 -r54932
--- vhTest/Mock/DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 54464)
+++ vhTest/Mock/DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 54932)
@@ -76,12 +76,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefBeloofdeLeverdatum">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefBeloofdeLeverdatum")
-]]></Implementation>
-</Method>
-
 <Method name="GeefBijhorendeBackorderLijnCodes">
 <FormalSpec>LijnCode:%String</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
@@ -449,12 +443,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetBeloofdeLeverdatum">
-<FormalSpec>Value:%String</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetBeloofdeLeverdatum",Value)
-]]></Implementation>
-</Method>
-
 <Method name="ZetCommissieReferentie">
 <FormalSpec>value:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetCommissieReferentie",value)