Index: AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml
===================================================================
diff -u -r48187 -r48379
--- AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 48187)
+++ AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 48379)
@@ -3,6 +3,20 @@
 <Class name="AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder">
 <Super>TECH.Mockable</Super>
 
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Logger = ##class(vhLib.Logger).%New()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Converteer">
 <FormalSpec>Order:DOM.VKP.Order,MessageId:%String</FormalSpec>
 <ReturnType>AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader</ReturnType>
@@ -30,6 +44,7 @@
 	Set OrderHeader.DlvAddrCity = Leveradres.GeefGemeente()
 	Set OrderHeader.DlvAddrZipCode = Leveradres.GeefPostcode()
 	Set OrderHeader.DlvAddrStreet1 = Leveradres.GeefStraat()
+	Set OrderHeader.DlvMode = ..MaakDlvMode(Order)
 	
 	Set OrderHeader.InvoiceBody = Order.GeefTekstVoorAfdrukDocumentType(##class(DOM.VKP.enu.TekstAfdrukDocumentType).Faktuur())
 	Set OrderHeader.PackingSlipBody = Order.GeefTekstVoorAfdrukDocumentType(##class(DOM.VKP.enu.TekstAfdrukDocumentType).LeverBon())
@@ -46,6 +61,27 @@
 <Implementation><![CDATA[	quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="MaakDlvMode">
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim DlvMode = ""
+	Try {
+		Set DlvMode = ##class(AXimpl.AdminToAxUtils).ConvertVerzendingWijze(Order.GeefVerzendingWijze())
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("AXimpl.AxToAdminUtils.ConvertVerzendingWijze.NeemDI1IndienNietGevondenActief") {
+			Do ..Logger.ErrorMail("MaakVerzendingWijze gefaald", "Order='"_Order.GeefID()_"', Probleem: "_Exception.ToString())
+		} Else {
+			Do ..Logger.Warning("MaakVerzendingWijze gefaald", "Order='"_Order.GeefID()_"', Probleem: "_Exception.ToString())
+		}
+		Set DlvMode = "DI1"
+	}
+	Quit DlvMode
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml
===================================================================
diff -u -r47866 -r48379
--- vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml	(.../Result.xml)	(revision 47866)
+++ vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml	(.../Result.xml)	(revision 48379)
@@ -9,6 +9,7 @@
   <DlvAddrCountry>BE</DlvAddrCountry>
   <DlvAddrStreet1>Ankerstraat 91</DlvAddrStreet1>
   <DlvAddrZipCode>9100</DlvAddrZipCode>
+  <DlvMode>DI1</DlvMode>
   <InvoiceAccount>01234</InvoiceAccount>
   <MessageId>MessageId</MessageId>
   <PurchOrderFormNum>OrderReferentie</PurchOrderFormNum>
Index: AXimpl/AdminToAxUtils.cls.xml
===================================================================
diff -u -r47731 -r48379
--- AXimpl/AdminToAxUtils.cls.xml	(.../AdminToAxUtils.cls.xml)	(revision 47731)
+++ AXimpl/AdminToAxUtils.cls.xml	(.../AdminToAxUtils.cls.xml)	(revision 48379)
@@ -209,6 +209,17 @@
 	Quit ##class(BL.Flow.Offerte.enu.Oorsprong).IngaveOV()
 ]]></Implementation>
 </Method>
+
+<Method name="ConvertVerzendingWijze">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>VerzendWijze:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set DlvMode=$Piece( $Get(^RES("KLANT","PI","VERZENDWAX","D",VerzendWijze)), "\", 1)
+	Do:(""=DlvMode) ##class(TECH.ExceptionHandler).Throw("Geen AX Delivery Mode gevonden voor Admin Verzendwijze '" _ VerzendWijze _ "'.")
+	Quit DlvMode
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml
===================================================================
diff -u -r42905 -r48379
--- vhTest/Fake/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 42905)
+++ vhTest/Fake/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml	(.../OrderHoofdingConverteerder.cls.xml)	(revision 48379)
@@ -8,7 +8,7 @@
 <Super>AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder</Super>
 
 <Method name="Converteer">
-<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<FormalSpec>Order:DOM.VKP.Order,MessageId:%String</FormalSpec>
 <ReturnType>AXif.Dynamics.SalesOrderOut.MessageParts.AxdEntityOrderHeader</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>