Index: AXif/Dynamics/SalesOrderIn/MessageParts/AxdExtTypeName.cls.xml
===================================================================
diff -u
--- AXif/Dynamics/SalesOrderIn/MessageParts/AxdExtTypeName.cls.xml	(revision 0)
+++ AXif/Dynamics/SalesOrderIn/MessageParts/AxdExtTypeName.cls.xml	(revision 66879)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Dynamics.SalesOrderIn.MessageParts.AxdExtTypeName">
+<ClassType>datatype</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="MAXLEN">
+<Default>100</Default>
+</Parameter>
+
+<Parameter name="MINLEN">
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://schemas.microsoft.com/dynamics/2008/01/sharedtypes</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AXif/Dynamics/SalesOrderIn/MessageParts/AxdEntityOrderHeader.cls.xml
===================================================================
diff -u -r56000 -r66879
--- AXif/Dynamics/SalesOrderIn/MessageParts/AxdEntityOrderHeader.cls.xml	(.../AxdEntityOrderHeader.cls.xml)	(revision 56000)
+++ AXif/Dynamics/SalesOrderIn/MessageParts/AxdEntityOrderHeader.cls.xml	(.../AxdEntityOrderHeader.cls.xml)	(revision 66879)
@@ -176,6 +176,11 @@
 <Parameter name="XMLNAME" value="SalesOriginId"/>
 </Property>
 
+<Property name="ShipCarrierDeliveryContact">
+<Type>AXif.Dynamics.SalesOrderIn.MessageParts.AxdExtTypeName</Type>
+<Parameter name="XMLNAME" value="ShipCarrierDeliveryContact"/>
+</Property>
+
 <Property name="ShippingDateConfirmed">
 <Type>AXif.Dynamics.SalesOrderIn.MessageParts.AxdExtTypeSalesShippingDateConfirmed</Type>
 <Parameter name="XMLNAME" value="ShippingDateConfirmed"/>
@@ -238,8 +243,6 @@
 <State>AxdEntityOrderHeaderState</State>
 <StreamLocation>^AXif.DynamBADC.AxdEntityOrFBD5S</StreamLocation>
 <Data name="AxdEntityOrderHeaderState">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>ConfirmBody</Value>
 </Value>
@@ -357,6 +360,9 @@
 <Value name="39">
 <Value>ProdCmdBody</Value>
 </Value>
+<Value name="40">
+<Value>ShipCarrierDeliveryContact</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker/MaakLeverAdres/Test.cls.xml
===================================================================
diff -u -r55673 -r66879
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker/MaakLeverAdres/Test.cls.xml	(.../Test.cls.xml)	(revision 55673)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker/MaakLeverAdres/Test.cls.xml	(.../Test.cls.xml)	(revision 66879)
@@ -30,6 +30,38 @@
 	Do $$$AssertEquals(LeverAdres.Straat,StandaardOrderHeader.DlvAddrStreet1)
 	Do $$$AssertEquals(LeverAdres.LandNr,##class(DOM.common.enu.Land).Belgie())
 	Do $$$AssertEquals(LeverAdres.Naam,StandaardOrderHeader.DeliveryName)
+	Do $$$AssertEquals(LeverAdres.Telefoon,"LeveradresTelefoon")
+	Do $$$AssertEquals(LeverAdres.AxLeveradresId,"")
+	
+	Do LandRepositoryMock.Verifieer()
+	Do LandMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geen AXLeverAdresId ingevuld -&gt; gegevens uit header overnemen, telefoonnr in leveradres, dan standaard nr">
+<Implementation><![CDATA[
+	#dim StandaardOrder As AXif.Dynamics.SalesOrderIn.Envelope = ##class(vhTest.Utils.AXif.Dynamics.SalesOrderIn.Envelope).StandaardOrder()
+	#dim StandaardOrderHeader As AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader = StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1)
+	Set StandaardOrderHeader.LocationId = ""
+	Set StandaardOrderHeader.ShipCarrierDeliveryContact = ""
+	
+	Set ProjectSettingsApiStub = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).%New()
+	Do ProjectSettingsApiStub.IndienMethodCall("IsActiefAxLeverancierId").DanReturn($$$True)
+	
+	Set LandMock = ##class(vhTest.Mock.DOM.common.Land).%New()
+	Do LandMock.VerwachtMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Land).Belgie())
+	
+	Set LandRepositoryMock = ##class(vhTest.Mock.DOM.common.Locatie.impl.LandRepository).%New()
+	Do LandRepositoryMock.VerwachtMethodCall("GeefViaLandCodeIso2", "BE").DanReturn(LandMock)
+	
+	Set LeverAdresMaker = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker).%New(,,,,LandRepositoryMock)
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = LeverAdresMaker.MaakLeverAdres(StandaardOrderHeader)
+	
+	Do $$$AssertEquals(LeverAdres.Gemeente,StandaardOrderHeader.DlvAddrCity)
+	Do $$$AssertEquals(LeverAdres.Postcode,StandaardOrderHeader.DlvAddrZipCode)
+	Do $$$AssertEquals(LeverAdres.Straat,StandaardOrderHeader.DlvAddrStreet1)
+	Do $$$AssertEquals(LeverAdres.LandNr,##class(DOM.common.enu.Land).Belgie())
+	Do $$$AssertEquals(LeverAdres.Naam,StandaardOrderHeader.DeliveryName)
 	Do $$$AssertEquals(LeverAdres.Telefoon,"+3237601900")
 	Do $$$AssertEquals(LeverAdres.AxLeveradresId,"")
 	
@@ -61,7 +93,7 @@
 	Do $$$AssertEquals(LeverAdres.Straat,StandaardOrderHeader.DlvAddrStreet1)
 	Do $$$AssertEquals(LeverAdres.LandNr,##class(DOM.common.enu.Land).Belgie())
 	Do $$$AssertEquals(LeverAdres.Naam,StandaardOrderHeader.DeliveryName)
-	Do $$$AssertEquals(LeverAdres.Telefoon,"+3237601900")
+	Do $$$AssertEquals(LeverAdres.Telefoon,"LeveradresTelefoon")
 	Do $$$AssertEquals(LeverAdres.AxLeveradresId,"")
 
 	Do LandRepositoryMock.Verifieer()
Index: vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml
===================================================================
diff -u -r56001 -r66879
--- vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 56001)
+++ vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 66879)
@@ -33,6 +33,7 @@
 	Set OrderHeader.LocationId = "1234"
 	Set OrderHeader.ModifiedByAlias="AXusername"
 	Set OrderHeader.ProdCmdBody = "ProdCmdBody"
+	Set OrderHeader.ShipCarrierDeliveryContact = "LeveradresTelefoon"
 	Do StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.Insert(OrderHeader)
 	
 	Quit StandaardOrder
Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml
===================================================================
diff -u -r55673 -r66879
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml	(.../LeverAdresMaker.cls.xml)	(revision 55673)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml	(.../LeverAdresMaker.cls.xml)	(revision 66879)
@@ -62,6 +62,8 @@
 	Do LeverAdres.ZetStraat(OrderHeader.DlvAddrStreet1)
 	Do LeverAdres.ZetLandNr(..LandRepository.GeefViaLandCodeIso2(OrderHeader.DlvAddrCountry).GeefID())
 	Do LeverAdres.ZetNaam(OrderHeader.DeliveryName)
+	Do LeverAdres.ZetTelefoon(OrderHeader.ShipCarrierDeliveryContact)
+	; Tel + provincie hier
 		
 	If ($$$HasLength(OrderHeader.LocationId) && (..ProjectSettingsApi.IsActiefAxLeverancierId())){
 		If ..LeverAdresRepository.BestaatViaAXLeverAdresIdEnKlantNummer(OrderHeader.LocationId, OrderHeader.CustAccount) {