Index: AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresIterator.cls.xml
===================================================================
diff -u -r47696 -r47740
--- AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresIterator.cls.xml	(.../KlantAdresIterator.cls.xml)	(revision 47696)
+++ AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresIterator.cls.xml	(.../KlantAdresIterator.cls.xml)	(revision 47740)
@@ -3,111 +3,47 @@
 <Class name="AX.Uitgaand.VKP.KlantAdres.impl.KlantAdresIterator">
 <Super>TECH.RegisteredObject,TECH.Iterator</Super>
 
-<Property name="LeveradresRepository">
-<Type>AXimpl.Crm.CustomerAddressOut.Converter.LeveradresRepository</Type>
+<Property name="KlantAdresIterator">
+<Type>TECH.CombinedIterator</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="AdresObject">
-<Type>AX.Uitgaand.VKP.KlantAdres.impl.KlantAdres</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Klant">
-<Type>DOM.VKP.VanHoeckeKlant</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="KlantIterator">
-<Type>TECH.Iterator</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="GlobalIterator">
-<Type>TECH.GlobalIndexIterator</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="Converter">
 <Type>AX.Uitgaand.VKP.KlantAdres.impl.KlantAdresDixfConverter</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="VerkoopAPI">
-<Type>DOM.VKP.VerkoopAPI</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="IsBezoekAdres">
-<Type>%Boolean</Type>
-<InitialExpression>0</InitialExpression>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>VerkoopAPI:DOM.VKP.VerkoopAPI,LeveradresRepository:AXimpl.Crm.CustomerAddressOut.Converter.LeveradresRepository</FormalSpec>
+<FormalSpec>VerkoopAPI:DOM.VKP.VerkoopAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
-	Set ..LeveradresRepository = $$$Inject(LeveradresRepository,##class(AXimpl.Crm.CustomerAddressOut.Converter.LeveradresRepository).%New())
+	#dim VerkoopApi As DOM.VKP.VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
 	Set Filter = ##class(AX.Uitgaand.VKP.impl.KlantIteratorFilter).%New()
-	Set ..KlantIterator = ##class(TECH.DynamicIterator).%New(..VerkoopAPI.GeefKlantIterator(),,Filter)
-	Set ..GlobalIterator = ##class(TECH.GlobalIndexIterator).%New($name(^KKL.AdresI("KlantId_AdresVolgNr")))
+	Set KlantIterator = ##class(TECH.DynamicIterator).%New(VerkoopApi.GeefKlantIterator(),,Filter)
+	Set ..KlantAdresIterator = ##class(TECH.CombinedIterator).%New(KlantIterator,"AX.Uitgaand.VKP.KlantAdres.impl.AdresIterator")
 	Set ..Converter = ##class(AX.Uitgaand.VKP.KlantAdres.impl.KlantAdresDixfConverter).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="HasNext">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim HeeftVolgendeKlant, VolgendAdres As %Boolean = $$$False
-	
-	If (..IsBezoekAdres) {
-		Set VolgendAdres = $$$True
-		Set ..IsBezoekAdres = $$$False
-		
-		Set ..AdresObject.Adres = ..Klant.GeefBezoekAdres()
-		Set ..AdresObject.Type = "Real location"
-	} ElseIf (..KlantIterator.HasNext() > 0) {
-		Set HeeftVolgendeKlant = $$$True
-		Set ..IsBezoekAdres = $$$False
-		
-		Set ..Klant = ..KlantIterator.Next()
-		Set ..AdresObject = ##class(AX.Uitgaand.VKP.KlantAdres.impl.KlantAdres).%New()
-		Set ..AdresObject.Klant = ..Klant
-		Set ..AdresObject.Adres = ..Klant.GeefAdres()
-		Set ..AdresObject.Type = "Business"
-		
-		If $IsObject(..Klant.GeefBezoekAdres()) {
-			Set ..IsBezoekAdres = $$$False // $$$True
-		}
-	} ElseIf (..GlobalIterator.HasNext() > 0) {
-		Set VolgendAdres = $$$True
-		
-		#dim Continue As %Boolean = $$$True
-		While Continue {
-			#dim NextUniekId As %String = ..GlobalIterator.Next()
-			#dim KlantId As %String = $Piece(##class(TECH.ListUtils).ListbuildToPieces(^KKL.AdresI("KlantId_AdresVolgNr",NextUniekId),","),",",1)
-			Set ..Klant = ..VerkoopAPI.GeefKlant(KlantId)
-			Set ..AdresObject.Klant = ..Klant
-			Set ..AdresObject.Adres = ..LeveradresRepository.GeefViaID(NextUniekId)
-			Set ..AdresObject.Type = $$$If(..AdresObject.Adres.GeefType()="B","Real location","Delivery")
-			Set Continue = (..Klant.GeefRegio() = 98) || (..Klant.GeefRegio() = 99)
-		}
-	}
-		
-	Quit (HeeftVolgendeKlant || VolgendAdres)
+<Implementation><![CDATA[	Quit ..KlantAdresIterator.HasNext()
 ]]></Implementation>
 </Method>
 
 <Method name="Next">
 <ReturnType>AXdixf.KlantAdres.KlantAdres</ReturnType>
 <Implementation><![CDATA[
-	#dim ConvertedKlantAdres As AXdixf.KlantAdres.KlantAdres = ..Converter.Convert(..AdresObject)
+	#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)
 	
 	Quit ConvertedKlantAdres
 ]]></Implementation>
Index: AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresDixfConverter.cls.xml
===================================================================
diff -u -r47693 -r47740
--- AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresDixfConverter.cls.xml	(.../KlantAdresDixfConverter.cls.xml)	(revision 47693)
+++ AX/Uitgaand/VKP/KlantAdres/impl/KlantAdresDixfConverter.cls.xml	(.../KlantAdresDixfConverter.cls.xml)	(revision 47740)
@@ -25,7 +25,7 @@
 <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.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()
Index: DOM/VKP/impl/DataM/DataMKlantNative.cls.xml
===================================================================
diff -u -r47154 -r47740
--- DOM/VKP/impl/DataM/DataMKlantNative.cls.xml	(.../DataMKlantNative.cls.xml)	(revision 47154)
+++ DOM/VKP/impl/DataM/DataMKlantNative.cls.xml	(.../DataMKlantNative.cls.xml)	(revision 47740)
@@ -223,7 +223,7 @@
 <ReturnType>DOM.common.Adres</ReturnType>
 <Implementation><![CDATA[
 	#dim BezoekAdres As DOM.common.Adres = ""
-	#dim BezoekAdressen As %ListOfObjects = ..GeefAdressen("B")
+	#dim BezoekAdressen As %ListOfObjects = ..GeefAdressenVolgensType("B")
 	If BezoekAdressen.Count() > 0 {
 		Set BezoekAdres = BezoekAdressen.GetAt(1)
 	}
@@ -354,7 +354,7 @@
 <ReturnType>DOM.common.Adres</ReturnType>
 <Implementation><![CDATA[
 	#dim Adres As %String = ""
-	#dim Adressen As %ListOfObjects = ..GeefAdressen("F")
+	#dim Adressen As %ListOfObjects = ..GeefAdressenVolgensType("F")
 	If Adressen.Count() > 0 {
 		Set Adres = Adressen.GetAt(1)
 	}
@@ -394,20 +394,37 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefAdressen">
+<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)
+	Quit Adressen
+]]></Implementation>
+</Method>
+
+<Method name="GeefAdresIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..GeefAdressen())
+]]></Implementation>
+</Method>
+
 <Method name="GeefLeverAdressen">
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="DOM.common.Adres"</ReturnTypeParams>
 <Implementation><![CDATA[
 	Set LeverAdressen = ##class(%ListOfObjects).%New()
-	Do ##class(TECH.ListUtils).CopyListOfObjects(..GeefAdressen("L"),LeverAdressen)
+	Do ##class(TECH.ListUtils).CopyListOfObjects(..GeefAdressenVolgensType("L"),LeverAdressen)
 	If LeverAdressen.Count() = 0 {
-		Do ##class(TECH.ListUtils).CopyListOfObjects(..GeefAdressen(""),LeverAdressen)
+		Do ##class(TECH.ListUtils).CopyListOfObjects(..GeefAdressenVolgensType(""),LeverAdressen)
 	}
 	Quit LeverAdressen
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAdressen">
+<Method name="GeefAdressenVolgensType">
 <Description>
 AdresType 
 - "L" of "" 	= LeverAdres
Index: AX/Uitgaand/VKP/KlantAdres/impl/AdresIterator.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/VKP/KlantAdres/impl/AdresIterator.cls.xml	(revision 0)
+++ AX/Uitgaand/VKP/KlantAdres/impl/AdresIterator.cls.xml	(revision 47740)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.VKP.KlantAdres.impl.AdresIterator">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="AdresIterator">
+<Type>TECH.Iterator</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()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..AdresIterator.HasNext()
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	Quit ..AdresIterator.Next()
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+<Implementation><![CDATA[	Quit ..AdresIterator.Reset()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>