Index: AX/Uitgaand/VKP/KlantAdres/impl/AdresIteratorFilter.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/VKP/KlantAdres/impl/AdresIteratorFilter.cls.xml	(revision 0)
+++ AX/Uitgaand/VKP/KlantAdres/impl/AdresIteratorFilter.cls.xml	(revision 48212)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.VKP.KlantAdres.impl.AdresIteratorFilter">
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Method name="IsValid">
+<FormalSpec>LeverAdres:DOM.common.Adres</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$$Not(LeverAdres.GeefNaam() = "")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/impl/DataM/DataMKlantNative.cls.xml
===================================================================
diff -u -r47740 -r48212
--- DOM/VKP/impl/DataM/DataMKlantNative.cls.xml	(.../DataMKlantNative.cls.xml)	(revision 47740)
+++ DOM/VKP/impl/DataM/DataMKlantNative.cls.xml	(.../DataMKlantNative.cls.xml)	(revision 48212)
@@ -398,9 +398,19 @@
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="DOM.common.Adres"</ReturnTypeParams>
 <Implementation><![CDATA[
-	Set Adressen = ##class(%ListOfObjects).%New()
-	;Do Adressen.Insert(..GeefAdres())
-	Do ##class(TECH.ListUtils).CopyListOfObjects(..GeefAdressenVolgensType(""),Adressen)
+	#Dim Adressen As %ListOfObjects = ##class(%ListOfObjects).%New()
+	#Dim LijnNr As %Integer = 1
+	#Dim Node As %String = "L" _ $$$LeftPadding(LijnNr, 3, " ")
+	#Dim IndexKKL As %String = ..GeefKlantIndexKKL()
+	#Dim AdresKey As %String = "L"
+	
+	Set AdresKey = $Order(^KKL(IndexKKL, AdresKey))
+	
+	While ($Extract(AdresKey) = "L") {
+		#Dim AdresGegevens As %String = ^KKL(..GeefKlantIndexKKL(), AdresKey)	
+		Do Adressen.Insert(..GeefSpecifiekAdres(AdresKey))
+		Set AdresKey = $Order(^KKL(IndexKKL, AdresKey))
+	}
 	Quit Adressen
 ]]></Implementation>
 </Method>
Index: AX/Uitgaand/VKP/KlantAdres/impl/AdresIterator.cls.xml
===================================================================
diff -u -r47740 -r48212
--- AX/Uitgaand/VKP/KlantAdres/impl/AdresIterator.cls.xml	(.../AdresIterator.cls.xml)	(revision 47740)
+++ AX/Uitgaand/VKP/KlantAdres/impl/AdresIterator.cls.xml	(.../AdresIterator.cls.xml)	(revision 48212)
@@ -8,14 +8,27 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Klant">
+<Type>DOM.VKP.VanHoeckeKlant</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..AdresIterator = Klant.GeefAdresIterator()
+	Set Filter = ##class(AX.Uitgaand.VKP.KlantAdres.impl.AdresIteratorFilter).%New()
+	#dim LeverAdresIterator As TECH.Iterator = Klant.GeefAdresIterator()
+	Set HoofdAdresLijst = ##class(%ListOfDataTypes).%New()
+	Do HoofdAdresLijst.Insert(Klant.GeefAdres())
+	Set HoofdAdresIterator = ##class(TECH.ListIterator).%New(HoofdAdresLijst)
+	Set HoofdEnLeverAdresIterator = ##class(TECH.IteratorOfIterators).%New()
+	Do HoofdEnLeverAdresIterator.SetIterators(HoofdAdresIterator, LeverAdresIterator)
+	Set ..AdresIterator = ##class(TECH.DynamicIterator).%New(HoofdEnLeverAdresIterator,,Filter)
+	Set ..Klant = Klant
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -28,7 +41,11 @@
 
 <Method name="Next">
 <ReturnType>%CacheString</ReturnType>
-<Implementation><![CDATA[	Quit ..AdresIterator.Next()
+<Implementation><![CDATA[
+	Set AdresObject = ##class(AX.Uitgaand.VKP.KlantAdres.impl.KlantAdres).%New()
+	Set AdresObject.Klant = ..Klant
+	Set AdresObject.Adres = ..AdresIterator.Next()
+	Quit AdresObject
 ]]></Implementation>
 </Method>
 
Index: DOM/VKP/VanHoeckeKlant.cls.xml
===================================================================
diff -u -r47178 -r48212
--- DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 47178)
+++ DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 48212)
@@ -541,6 +541,11 @@
 <Abstract>1</Abstract>
 <ReturnType>%ListOfDataTypes</ReturnType>
 </Method>
+
+<Method name="GeefAdresIterator">
+<Abstract>1</Abstract>
+<ReturnType>TECH.Iterator</ReturnType>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresDixfConverter.cls.xml
===================================================================
diff -u -r47740 -r48212
--- AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresDixfConverter.cls.xml	(.../KlantAdresDixfConverter.cls.xml)	(revision 47740)
+++ AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresDixfConverter.cls.xml	(.../KlantAdresDixfConverter.cls.xml)	(revision 48212)
@@ -8,34 +8,71 @@
 <Private>1</Private>
 </Property>
 
+<Property name="IsPrimaryLijst">
+<Type>%ListOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..AXimplFormatter = ##class(AXimpl.Formatter).%New()
+	Set ..IsPrimaryLijst = ##class(%ListOfDataTypes).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Convert">
-<FormalSpec>KlantAdresData:AX.Uitgaand.VKP.KlantAdres.impl.KlantAdres</FormalSpec>
+<FormalSpec>AdresEnKlantObject:AX.Uitgaand.VKP.KlantAdres.impl.KlantAdres</FormalSpec>
 <ReturnType>AXdixf.KlantAdres.KlantAdres</ReturnType>
 <Implementation><![CDATA[
 	Set AxKlantAdres = ##class(AXdixf.KlantAdres.KlantAdres).%New()
-	Set AxKlantAdres.AddressName = KlantAdresData.Adres.GeefNaam()
-	;Set AxKlantAdres.CustAccountNum = ..AXimplFormatter.FormatAccountNumber($Piece(KlantAdresData.Klant.GeefID(),"||",2))
-	Set AxKlantAdres.LocationRole = KlantAdresData.Type
-	Set AxKlantAdres.Street = KlantAdresData.Adres.GeefStraat()
-	Set AxKlantAdres.ZipCode = KlantAdresData.Adres.GeefPostcode()
-	Set AxKlantAdres.City = KlantAdresData.Adres.GeefGemeente()
-	Set AxKlantAdres.CountryRegionId = $$$If(KlantAdresData.Adres.GeefLandNr()="",KlantAdresData.Klant.GeefAdres().GeefLand().GeefIso3(),KlantAdresData.Adres.GeefLand().GeefIso3())
+	
+	Set AxKlantAdres.AddressName = AdresEnKlantObject.Adres.GeefNaam()
+	Set AxKlantAdres.CustAccountNum = ..AXimplFormatter.FormatAccountNumber($Piece(AdresEnKlantObject.Klant.GeefID(),"||",2))
+	Set AxKlantAdres.LocationRole = ..GeefLocationRole(AdresEnKlantObject)
+	Set AxKlantAdres.Street = AdresEnKlantObject.Adres.GeefStraat()
+	Set AxKlantAdres.ZipCode = AdresEnKlantObject.Adres.GeefPostcode()
+	Set AxKlantAdres.City = AdresEnKlantObject.Adres.GeefGemeente()
+	Set AxKlantAdres.CountryRegionId = AdresEnKlantObject.Klant.GeefAdres().GeefLand().GeefIso3()
 	Set AxKlantAdres.AddressPhone = ""
-	Set AxKlantAdres.IsPrimary = ""
+	Set AxKlantAdres.IsPrimary = ..GeefIsPrimary(AdresEnKlantObject, AxKlantAdres.LocationRole)
+	
 	Quit AxKlantAdres
 ]]></Implementation>
 </Method>
+
+<Method name="GeefLocationRole">
+<FormalSpec>AdresEnKlantObject:AX.Uitgaand.VKP.KlantAdres.impl.KlantAdres</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Type As %String = AdresEnKlantObject.Adres.Type
+	
+	Quit:Type="L" "Delivery"
+	Quit:Type="B" "Real location"
+	Quit:Type="F" "Invoice"
+	Quit "Business"
+]]></Implementation>
+</Method>
+
+<Method name="GeefIsPrimary">
+<FormalSpec>AdresEnKlantObject:AX.Uitgaand.VKP.KlantAdres.impl.KlantAdres,LocationRole:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Quit:LocationRole="Business" "1"
+	
+	If $$$Not(##class(TECH.ListUtils).Contains(..IsPrimaryLijst, AdresEnKlantObject.Klant.GeefID()_AdresEnKlantObject.Adres.Type)) {
+		Do ..IsPrimaryLijst.Insert(AdresEnKlantObject.Klant.GeefID()_AdresEnKlantObject.Adres.Type)
+		Quit "1"
+	}
+	
+	Quit "0"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/VKP/KlantAdres/impl/KlantAdres.cls.xml
===================================================================
diff -u -r47659 -r48212
--- AX/Uitgaand/VKP/KlantAdres/impl/KlantAdres.cls.xml	(.../KlantAdres.cls.xml)	(revision 47659)
+++ AX/Uitgaand/VKP/KlantAdres/impl/KlantAdres.cls.xml	(.../KlantAdres.cls.xml)	(revision 48212)
@@ -12,12 +12,8 @@
 </Property>
 
 <Property name="Adres">
-<Type>DOM.VKP.LeverAdres</Type>
+<Type>DOM.common.Adres</Type>
 </Property>
-
-<Property name="Type">
-<Type>%String</Type>
-</Property>
 </Class>
 
 
Index: vhTest/Mock/DOM/VKP/VanHoeckeKlant.cls.xml
===================================================================
diff -u -r47178 -r48212
--- vhTest/Mock/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 47178)
+++ vhTest/Mock/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 48212)
@@ -20,6 +20,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefAdresIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefAdresIterator")
+]]></Implementation>
+</Method>
+
 <Method name="GeefBTWNr">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefBTWNr")
Index: AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresIterator.cls.xml
===================================================================
diff -u -r47740 -r48212
--- AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresIterator.cls.xml	(.../KlantAdresIterator.cls.xml)	(revision 47740)
+++ AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresIterator.cls.xml	(.../KlantAdresIterator.cls.xml)	(revision 48212)
@@ -38,12 +38,8 @@
 <Method name="Next">
 <ReturnType>AXdixf.KlantAdres.KlantAdres</ReturnType>
 <Implementation><![CDATA[
-	#dim Adres As DOM.common.Adres = ..KlantAdresIterator.Next()
-	Set AdresObject = ##class(AX.Uitgaand.VKP.KlantAdres.impl.KlantAdres).%New()
-	Set AdresObject.Klant = Adres.GeefNaam()
-	Set AdresObject.Adres = Adres
-	Set AdresObject.Type = Adres.GeefType()
-	#dim ConvertedKlantAdres As AXdixf.KlantAdres.KlantAdres = ..Converter.Convert(AdresObject)
+	#dim AdresEnKlantObject As AX.Uitgaand.VKP.KlantAdres.impl.KlantAdres = ..KlantAdresIterator.Next()
+	#dim ConvertedKlantAdres As AXdixf.KlantAdres.KlantAdres = ..Converter.Convert(AdresEnKlantObject)
 	
 	Quit ConvertedKlantAdres
 ]]></Implementation>
Index: DOM/common/impl/AdresUtils.cls.xml
===================================================================
diff -u -r44125 -r48212
--- DOM/common/impl/AdresUtils.cls.xml	(.../AdresUtils.cls.xml)	(revision 44125)
+++ DOM/common/impl/AdresUtils.cls.xml	(.../AdresUtils.cls.xml)	(revision 48212)
@@ -20,6 +20,7 @@
 	Set Adres.Opmerking1 = $piece(AdresData,"\",24)
 	Set Adres.Opmerking2 = $piece(AdresData,"\",25)		
 	Set Adres.Postcode = ..CorrigeerPostcode(Adres.Postcode, Adres.LandNr)
+	Set Adres.Type = $Piece(AdresData,"\",12)
 ]]></Implementation>
 </Method>