Index: AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml
===================================================================
diff -u -r44047 -r44048
--- AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 44047)
+++ AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 44048)
@@ -18,8 +18,14 @@
 	Set OrderHeader.class = "entity"
 	Set OrderHeader.MessageId = MessageId
 	
-	Set OrderHeader.DeliveryName = Order.GeefAfleveradres().GeefNaam()
+	#dim Leveradres as DOM.VKP.LeverAdres = Order.GeefAfleveradres()
+	Set OrderHeader.DeliveryName = Leveradres.GeefNaam()
+	Set OrderHeader.DlvAddrCountry = Leveradres.GeefLand().GeefCode()
+	Set OrderHeader.DlvAddrCity = Leveradres.GeefGemeente()
+	Set OrderHeader.DlvAddrZipCode = Leveradres.GeefPostcode()
+	Set OrderHeader.DlvAddrStreet1 = Leveradres.GeefStraat()
 	
+	
 	Quit OrderHeader
 ]]></Implementation>
 </Method>
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml
===================================================================
diff -u -r44047 -r44048
--- vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml	(.../Test.cls.xml)	(revision 44047)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml	(.../Test.cls.xml)	(revision 44048)
@@ -22,6 +22,16 @@
 	do $$$AssertEquals(OrderHeader.MessageId,"MessageId")
 
 	Do $$$AssertEquals(OrderHeader.DeliveryName,"Een Belg")
+	Do $$$AssertEquals(OrderHeader.DlvAddrCountry ,"BE")
+	Do $$$AssertEquals(OrderHeader.DlvAddrCity,"Sint-Niklaas")
+	Do $$$AssertEquals(OrderHeader.DlvAddrZipCode,"9100")
+	Do $$$AssertEquals(OrderHeader.DlvAddrStreet1,"Ankerstraat 91")
+	/*
+	do LeverAdres.ZetLandNr(1019)
+	Do LeverAdres.ZetPostcode("9100")
+	Do LeverAdres.ZetStraat("Ankerstraat 91")
+	Do LeverAdres.ZetGemeente("Sint-Niklaas")
+	*/
 ]]></Implementation>
 </Method>
 </Class>