Index: vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml
===================================================================
diff -u -r38266 -r38269
--- vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38266)
+++ vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38269)
@@ -24,6 +24,8 @@
 	Do ##super(aTestName)
 	
 	Set ..VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
+	Set ..Klant = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
+	Do ..Klant.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	Do ..VerkoopAPI.IndienMethodCall("GeefKlant",$$$ElkeWaarde).DanReturn(..Klant)
 	
 	Set ..Leveradres = ##class(vhTest.Fake.DOM.VKP.LeverAdres).%New(1)
@@ -58,6 +60,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Geen landcode in leveradres -&gt; defaulten naar landcode van hoofdadres">
+<Implementation><![CDATA[
+	Do ..Leveradres.ZetLandNr("")
+	
+	#dim GeconverteerdeLeverAdres As AXBizTalk.Crm.Address.Upsert.Address = ..GeefAddress(..Leveradres.GeefID())
+	Do $$$AssertEquals(GeconverteerdeLeverAdres.LandCodeISO3,"BEL")
+]]></Implementation>
+</Method>
+
 <Method name="GeefAddress">
 <FormalSpec>LeveradresId:%String</FormalSpec>
 <ReturnType>AXBizTalk.Crm.Address.Upsert.Address</ReturnType>
Index: AX/Uitgaand/VKP/VanHoeckeKlantAdditioneleAdressen/impl/DixfGenerator.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/VKP/VanHoeckeKlantAdditioneleAdressen/impl/DixfGenerator.cls.xml	(revision 0)
+++ AX/Uitgaand/VKP/VanHoeckeKlantAdditioneleAdressen/impl/DixfGenerator.cls.xml	(revision 38269)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.VKP.VanHoeckeKlantAdditioneleAdressen.impl.DixfGenerator">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="BestandGenerator">
+<Type>APPS.common.Rapport.impl.BestandGenerator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="GenerateAll">
+<Implementation><![CDATA[
+	set GlobalIterator = ##class(TECH.GlobalIndexIterator).%New($name(^KKL.AdresI("KlantId_AdresVolgNr")))
+	do ..Generate(GlobalIterator)
+]]></Implementation>
+</Method>
+
+<Method name="Generate">
+<FormalSpec>VanHoeckeKlantAdditioneleAdressenIterator:TECH.Iterator</FormalSpec>
+<Implementation><![CDATA[
+	Set AxVanHoeckeKlantIterator = ##class(AX.Uitgaand.VKP.VanHoeckeKlantAdditioneleAdressen.impl.AxVanHoeckeKlantAdditioneleAdressenIterator).%New(VanHoeckeKlantAdditioneleAdressenIterator)
+		
+	Set Headers = ##class(TECH.KeyValue.List).%New() 
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "LeveradresId")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "Klantnummer")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "BezoekAdres")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "ToonzaalAdres")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "LeveringAdres")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "FacturatieAdres")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "Straat1")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "Straat2")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "Straat3")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "Postcode")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "Plaats")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "County")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "Provincie")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "LandCodeISO3")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "Telefoon")
+	Do Headers.InsertKeyValue("AXBizTalk.Crm.Address.Upsert.Address", "Verzendwijze")
+		
+	#dim AXKlantData As APPS.common.Rapport.dto.BestandRapportDataObjectIteratorBased	
+	Set AXKlantData = ##class(APPS.common.Rapport.dto.BestandRapportDataObjectIteratorBased).%New()
+	Set AXKlantData.ScheidingsTeken = ";"	
+	Set AXKlantData.Iterator = AxVanHoeckeKlantIterator
+	Set AXKlantData.DataVelden = Headers
+	Set AXKlantData.BestandVolledigeNaam = ##class(TECH.Files).AppendFile(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_DIXF"),"KlantenAdditioneleAdressen.csv")
+	
+	#dim BestandGenerator As APPS.common.Rapport.impl.BestandGenerator
+	Set BestandGenerator = ##class(APPS.common.Rapport.impl.BestandGenerator).%New()
+	Do BestandGenerator.MaakBestand(AXKlantData)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/DOM/VKP/LeverAdres.cls.xml
===================================================================
diff -u -r38127 -r38269
--- vhTest/Fake/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 38127)
+++ vhTest/Fake/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 38269)
@@ -13,6 +13,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="LandNr">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>ID:%String=""</FormalSpec>
 <Private>1</Private>
@@ -61,6 +66,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLandNr">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..LandNr
+]]></Implementation>
+</Method>
+
 <Method name="GeefTelefoon">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit "03/123456"_..ID
@@ -90,6 +101,12 @@
 <Implementation><![CDATA[	Set ..AdresType = AdresType
 ]]></Implementation>
 </Method>
+
+<Method name="ZetLandNr">
+<FormalSpec>LandNr:%String</FormalSpec>
+<Implementation><![CDATA[	Set ..LandNr = LandNr
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/VKP/VanHoeckeKlantAdditioneleAdressen/impl/AxVanHoeckeKlantAdditioneleAdressenIterator.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/VKP/VanHoeckeKlantAdditioneleAdressen/impl/AxVanHoeckeKlantAdditioneleAdressenIterator.cls.xml	(revision 0)
+++ AX/Uitgaand/VKP/VanHoeckeKlantAdditioneleAdressen/impl/AxVanHoeckeKlantAdditioneleAdressenIterator.cls.xml	(revision 38269)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.VKP.VanHoeckeKlantAdditioneleAdressen.impl.AxVanHoeckeKlantAdditioneleAdressenIterator">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="KlantIterator">
+<Type>TECH.Iterator</Type>
+</Property>
+
+<Property name="Converter">
+<Type>AXimpl.BizTalkMessage.Converter.CustomerConverter</Type>
+</Property>
+
+<Property name="Key">
+<Type>%CacheString</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>KlantAdditioneleIterator:TECH.Iterator</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..KlantIterator = KlantAdditioneleIterator
+	Set ..Converter = ##class(AXimpl.BizTalkMessage.Converter.AddressUpsertConverter).%New()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..KlantIterator.HasNext()
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[
+	#dim NextUniekId As %String
+	Set NextUniekId = ..KlantIterator.Next()
+	Set ..Key = NextUniekId
+	
+	Set Request = ##class(AXBizTalk.Crm.Address.Upsert.Request).%New("Crm/Address/Upsert/Address",NextUniekId)
+	Quit ..Converter.Convert(Request).Address
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+<Implementation><![CDATA[	Quit ..KlantIterator.Reset()
+]]></Implementation>
+</Method>
+
+<Method name="Key">
+<Implementation><![CDATA[	Quit ..Key
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml
===================================================================
diff -u -r38266 -r38269
--- AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38266)
+++ AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38269)
@@ -46,7 +46,11 @@
 	Set ..Address.Klantnummer = ##class(AX.common.impl.ConvertAdminToAX).ConvertCustomerID(Adres.GeefKlantId())
 	Set ..Address.Postcode = Adres.GeefPostcode()
 	Set ..Address.Plaats = Adres.GeefGemeente()
-	Set ..Address.LandCodeISO3 = Adres.GeefLand().GeefIso3()
+	If Adres.GeefLandNr()="" {
+		Set ..Address.LandCodeISO3 = ..VerkoopAPI.GeefKlant(Adres.GeefKlantId()).GeefAdres().GeefLand().GeefIso3()
+	} Else {
+		Set ..Address.LandCodeISO3 = Adres.GeefLand().GeefIso3()
+	}
 	Set ..Address.Telefoon = Adres.GeefTelefoon()
 	Set ..Address.Verzendwijze = Adres.GeefVerzendingWijze()
 	Set ..Address.BezoekAdres = $$$False