Index: AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml
===================================================================
diff -u -r53163 -r53166
--- AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml	(.../AdresZetter.cls.xml)	(revision 53163)
+++ AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml	(.../AdresZetter.cls.xml)	(revision 53166)
@@ -120,8 +120,21 @@
 <Private>1</Private>
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
 <Implementation><![CDATA[
-	Do Adres.ZetTelefoon(BestaandLeverAdres.GeefTelefoon())
+	#dim IsNieuwTelefoonnummerGevonden As %Boolean = $$$False
 	
+	Set ElectronicAddressIterator = ##class(TECH.ListIterator).%New(Cust.ElectronicAddress)
+	While ElectronicAddressIterator.HasNext() {
+		#dim ElectronicAddress As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElectronicAddress = ElectronicAddressIterator.Next()
+		If ((ElectronicAddress.LocationId = Address.LocationId) && (ElectronicAddress.Type = "Phone")) {
+			Do Adres.ZetTelefoon(ElectronicAddress.Locator)
+			Set IsNieuwTelefoonnummerGevonden = $$$True
+		}
+	}
+	
+	If ($$$Not(IsNieuwTelefoonnummerGevonden)) {
+		Do Adres.ZetTelefoon(BestaandLeverAdres.GeefTelefoon())
+	}
+	
 	Quit Adres
 ]]></Implementation>
 </Method>
Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml
===================================================================
diff -u -r50732 -r53166
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml	(.../Test.cls.xml)	(revision 50732)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml	(.../Test.cls.xml)	(revision 53166)
@@ -266,6 +266,37 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Als van een AxdEntityElectronicAddress de LocationId matcht en Type is Phone dan moet bijhorend telefoonnummer gebruikt worden">
+<Implementation><![CDATA[
+	Set AdresZetter = ##class(AXimpl.Dynamics.CustomerIn.Converter.AdresZetter).%New()
+	#dim Adres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
+	#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = ..GeefAxLeverAdres()
+	#dim AxElectronicAddressLijst As %ListOfDataTypes = ..GeefAxElectronicAddressLijstMetInCacheGekendeLocationId()
+	#dim Cust As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefAxCust()
+	Set Cust.ElectronicAddress = AxElectronicAddressLijst
+	#dim BestaandLeverAdres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do BestaandLeverAdres.ZetTelefoon("03/1234567")
+	Do BestaandLeverAdres.ZetUniekId("000099999")
+	#dim IsPrimairAdres As %Boolean = $$$False
+	#dim GezetAdres As DOM.VKP.LeverAdres = AdresZetter.ZetAdres(Adres, Address, Cust, BestaandLeverAdres, IsPrimairAdres)
+	
+	Do $$$AssertEquals(GezetAdres.GeefNaam(),"Naam LeverAdres")
+	Do $$$AssertEquals(GezetAdres.GeefAanspreking(),"")
+	Do $$$AssertEquals(GezetAdres.GeefStraat(),"Straat LeverAdres")
+	Do $$$AssertEquals(GezetAdres.GeefPostcode(),"9100")
+	Do $$$AssertEquals(GezetAdres.GeefGemeente(),"Gemeente LeverAdres")
+	Do $$$AssertEquals(GezetAdres.GeefLandNr(),"1019")
+	Do $$$AssertEquals(GezetAdres.GeefVerzendingWijze(),"OD4;2`OD4;5")
+	Do $$$AssertEquals(GezetAdres.GeefType(),"")
+	Do $$$AssertEquals(GezetAdres.GeefTelefoon(),"01/2345678")
+	Do $$$AssertEquals(GezetAdres.GeefOpmerking1(),"Opmerking1 LeverAdres")
+	Do $$$AssertEquals(GezetAdres.GeefOpmerking2(),"Opmerking2 LeverAdres")
+	Do $$$AssertEquals(GezetAdres.GeefAxLeveradresId(),..#AxLocationId)
+	Do $$$AssertEquals(GezetAdres.GeefVolmacht(),"Volmacht LeverAdres")
+	Do $$$AssertEquals(GezetAdres.GeefUniekId(),"000099999")
+]]></Implementation>
+</Method>
+
 <Method name="GeefAxCust">
 <Private>1</Private>
 <ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</ReturnType>
@@ -355,6 +386,30 @@
 	Quit AxPostalAddress
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAxElectronicAddressLijstMetInCacheGekendeLocationId">
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	#dim AxElectronicAddressLijst As %ListOfObjects = ##class(%ListOfObjects).%New()
+	Do AxElectronicAddressLijst.Insert(..GeefAxElectronicAddress())
+	
+	Quit AxElectronicAddressLijst
+]]></Implementation>
+</Method>
+
+<Method name="GeefAxElectronicAddress">
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElectronicAddress</ReturnType>
+<Implementation><![CDATA[
+	Set AxElectronicAddress = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityElectronicAddress).%New()
+	Set AxElectronicAddress.LocationId = ..#AxLocationId
+	Set AxElectronicAddress.Type = "Phone"
+	Set AxElectronicAddress.Locator = "01/2345678"
+	
+	Quit AxElectronicAddress
+]]></Implementation>
+</Method>
 </Class>