Index: vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml
===================================================================
diff -u -r42730 -r42747
--- vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 42730)
+++ vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 42747)
@@ -11,7 +11,11 @@
 	
 	Set OrderHeader = ##class(AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader).%New()
 	Set OrderHeader.CustAccount = "12526"
-	
+	Set OrderHeader.DlvAddrCity = "Sint Niklaas"
+	Set OrderHeader.DlvAddrZipCode = "9100"
+	Set OrderHeader.DlvAddrStreet1 = "Hofstraat 6"
+	Set OrderHeader.DlvAddrCountry = "BE"
+
 	Do StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.Insert(OrderHeader)
 	
 	Quit StandaardOrder
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml
===================================================================
diff -u -r42730 -r42747
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 42730)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 42747)
@@ -5,20 +5,22 @@
 
 <Method name="Test: Een standaard order zonder lijnen wordt verwerkt en bewaard">
 <Implementation><![CDATA[
-	#dim StandaardOrderZonderLijnen As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Utils.DOM.VKP.Order).StandaardOrderZonderLijnen()
+	Set OrderMock = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	Do OrderMock.VerwachtMethodCall("ZetAfleveradres", $$$ElkeWaarde).ExactAantalKeer(1)
 	
 	Set OrderAPIMock = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
-	Do OrderAPIMock.VerwachtMethodCall("Bewaar", StandaardOrderZonderLijnen).ExactAantalKeer(1)
+	Do OrderAPIMock.VerwachtMethodCall("Bewaar", OrderMock).ExactAantalKeer(1)
 
 	Set OrderLevenCyclusServiceMock = ##class(vhTest.Mock.APPS.VKP.OrderLevenCyclusService).%New()
-	Do OrderLevenCyclusServiceMock.VerwachtMethodCall("MaakOrderMetKlantGegevens","K||12526","").DanReturn(StandaardOrderZonderLijnen)
+	Do OrderLevenCyclusServiceMock.VerwachtMethodCall("MaakOrderMetKlantGegevens","K||12526","").DanReturn(OrderMock)
 	
 	#dim StandaardOrder As AXif.Dynamics.SalesOrderIn.Envelope = ##class(vhTest.Utils.AXif.Dynamics.SalesOrderIn.Envelope).StandaardOrder()
 	Set SalesOrderConverter = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New(OrderAPIMock, OrderLevenCyclusServiceMock)
 	Do SalesOrderConverter.Convert(StandaardOrder)
 	
 	Do OrderAPIMock.Verifieer()
 	Do OrderLevenCyclusServiceMock.Verifieer()
+	Do OrderMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>
Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r42730 -r42747
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 42730)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 42747)
@@ -42,9 +42,19 @@
 <Method name="Convert">
 <FormalSpec>Message:AXif.Dynamics.SalesOrderIn.Envelope</FormalSpec>
 <Implementation><![CDATA[
-	#dim CustAccount As %String = Message.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1).CustAccount
-	#dim KlantID As %String = ..AxToAdminUtils.ConvertCustomerID(CustAccount)
+	#dim OrderHeader As AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader = Message.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1)
+	#dim KlantID As %String = ..AxToAdminUtils.ConvertCustomerID(OrderHeader.CustAccount)
+	
 	#Dim Order As DOM.VKP.Order = ..OrderLevenCyclusService.MaakOrderMetKlantGegevens(KlantID)
+	
+	Set LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do LeverAdres.ZetGemeente(OrderHeader.DlvAddrCity)
+	Do LeverAdres.ZetPostcode(OrderHeader.DlvAddrZipCode)
+	Do LeverAdres.ZetStraat(OrderHeader.DlvAddrStreet1)
+	Do LeverAdres.ZetLandNr(OrderHeader.DlvAddrCountry)
+
+	Do Order.ZetAfleveradres(LeverAdres)
+	
 	Do ..OrderAPI.Bewaar(Order)
 ]]></Implementation>
 </Method>