Index: vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml
===================================================================
diff -u -r48555 -r55673
--- vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml	(.../LeverAdresMaker.cls.xml)	(revision 48555)
+++ vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml	(.../LeverAdresMaker.cls.xml)	(revision 55673)
@@ -8,6 +8,13 @@
 <Super>AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="%OnNew">
+<FormalSpec>ProjectSettingsApi:DOM.common.ProjectSettingsAPI,LeverAdresRepository:DOM.VKP.impl.LeverAdresRepository,MailApi:TECH.Mail.MailAPI="",VerkoopApi:DOM.VKP.VerkoopAPI,LandRepository:DOM.common.Locatie.impl.LandRepository</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="MaakLeverAdres">
 <FormalSpec>OrderHeader:AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader</FormalSpec>
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker/MaakLeverAdres/Test.cls.xml
===================================================================
diff -u -r49909 -r55673
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker/MaakLeverAdres/Test.cls.xml	(.../Test.cls.xml)	(revision 49909)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker/MaakLeverAdres/Test.cls.xml	(.../Test.cls.xml)	(revision 55673)
@@ -16,16 +16,25 @@
 	Set ProjectSettingsApiStub = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).%New()
 	Do ProjectSettingsApiStub.IndienMethodCall("IsActiefAxLeverancierId").DanReturn($$$True)
 	
-	Set LeverAdresMaker = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker).%New()
+	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,StandaardOrderHeader.DlvAddrCountry)
+	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,"")
+	
+	Do LandRepositoryMock.Verifieer()
+	Do LandMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -38,16 +47,25 @@
 	Set ProjectSettingsApiStub = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).%New()
 	Do ProjectSettingsApiStub.IndienMethodCall("IsActiefAxLeverancierId").DanReturn($$$False)
 	
-	Set LeverAdresMaker = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker).%New(ProjectSettingsApiStub)
+	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(ProjectSettingsApiStub,,,,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,StandaardOrderHeader.DlvAddrCountry)
+	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,"")
+
+	Do LandRepositoryMock.Verifieer()
+	Do LandMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml
===================================================================
diff -u -r50462 -r55673
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml	(.../LeverAdresMaker.cls.xml)	(revision 50462)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/LeverAdresMaker.cls.xml	(.../LeverAdresMaker.cls.xml)	(revision 55673)
@@ -18,6 +18,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="LandRepository">
+<Type>DOM.common.Locatie.impl.LandRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="MailApi">
 <Type>TECH.Mail.MailAPI</Type>
 <Private>1</Private>
@@ -29,7 +34,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProjectSettingsApi:DOM.common.ProjectSettingsAPI,LeverAdresRepository:DOM.VKP.impl.LeverAdresRepository,MailApi:TECH.Mail.MailAPI="",VerkoopApi:DOM.VKP.VerkoopAPI</FormalSpec>
+<FormalSpec>ProjectSettingsApi:DOM.common.ProjectSettingsAPI,LeverAdresRepository:DOM.VKP.impl.LeverAdresRepository,MailApi:TECH.Mail.MailAPI="",VerkoopApi:DOM.VKP.VerkoopAPI,LandRepository:DOM.common.Locatie.impl.LandRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -40,7 +45,8 @@
 	Set ..LeverAdresRepository = $$$Inject(LeverAdresRepository,##class(DOM.VKP.impl.LeverAdresRepository).%New())
 	Set ..MailApi = $$$Inject(MailApi, ##class(TECH.Context).Instance().GeefMailAPI())
 	Set ..VerkoopApi = $$$Inject(VerkoopApi, ##class(DOM.VKP.impl.VerkoopAPI).%New())
-	
+	Set ..LandRepository  = $$$Inject(LandRepository,##class(DOM.common.Locatie.impl.LandRepository).%New())
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -54,7 +60,7 @@
 	Do LeverAdres.ZetGemeente(OrderHeader.DlvAddrCity)
 	Do LeverAdres.ZetPostcode(OrderHeader.DlvAddrZipCode)
 	Do LeverAdres.ZetStraat(OrderHeader.DlvAddrStreet1)
-	Do LeverAdres.ZetLandNr(OrderHeader.DlvAddrCountry)
+	Do LeverAdres.ZetLandNr(..LandRepository.GeefViaLandCodeIso2(OrderHeader.DlvAddrCountry).GeefID())
 	Do LeverAdres.ZetNaam(OrderHeader.DeliveryName)
 		
 	If ($$$HasLength(OrderHeader.LocationId) && (..ProjectSettingsApi.IsActiefAxLeverancierId())){
Index: vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml
===================================================================
diff -u -r54932 -r55673
--- vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 54932)
+++ vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 55673)
@@ -14,7 +14,7 @@
 	Set OrderHeader.DlvAddrCity = "Sint-Niklaas"
 	Set OrderHeader.DlvAddrZipCode = "9100"
 	Set OrderHeader.DlvAddrStreet1 = "Ankerstraat 91"
-	Set OrderHeader.DlvAddrCountry = "1019"
+	Set OrderHeader.DlvAddrCountry = "BE"
 	Set OrderHeader.DeliveryName = "Een Belg"
 	Set OrderHeader.CustomerRef = "CustomerRef"
 	Set OrderHeader.CreatedDateTimeHeader = ##class(AXif.Dynamics.SalesOrderIn.MessageParts.AxdExtTypeCreatedDateTime).%New()
Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r55646 -r55673
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 55646)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 55673)
@@ -88,6 +88,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="LandRepository">
+<Type>DOM.common.Locatie.impl.LandRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="KlantID">
 <Type>%String</Type>
 <Private>1</Private>
@@ -109,7 +114,7 @@
 </Property>
 
 <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>
+<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,LandRepository:DOM.common.Locatie.impl.LandRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -128,6 +133,7 @@
 	Set ..SalesOrderLineStatusRepository = $$$Inject(SalesOrderLineStatusRepository, ##class(AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository).%New())
 	Set ..Mailer = $$$Inject(Mailer,##class(AXimpl.Dynamics.SalesOrderIn.Converter.Mailer).%New())
 	Set ..LeverAdresMaker = $$$Inject(LeverAdresMaker,##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker).%New())
+	Set ..LandRepository  = $$$Inject(LandRepository,##class(DOM.common.Locatie.impl.LandRepository).%New())
 	
 	Set ..VerkoopApi = $$$Inject(VerkoopApi, ##class(DOM.VKP.impl.VerkoopAPI).%New())
 	
@@ -666,7 +672,8 @@
 <Implementation><![CDATA[
 	#dim VerzendWijzeAdmin As %String = ""
 	Try {
-		Set VerzendWijzeAdmin = ##class(AXimpl.AxToAdminUtils).ConvertVerzendingWijzeMetLandNr(OrderHeader.DlvMode, OrderHeader.DlvAddrCountry)
+		#dim LandNr As %String = ..LandRepository.GeefViaLandCodeIso2(OrderHeader.DlvAddrCountry).GeefID()
+		Set VerzendWijzeAdmin = ##class(AXimpl.AxToAdminUtils).ConvertVerzendingWijzeMetLandNr(OrderHeader.DlvMode, LandNr)
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("AXimpl.AxToAdminUtils.ConvertVerzendingWijze.NeemDI1IndienNietGevondenActief") {
Index: vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r54932 -r55673
--- vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 54932)
+++ vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 55673)
@@ -9,7 +9,7 @@
 <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>
+<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,LandRepository:DOM.common.Locatie.impl.LandRepository</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>