Index: vhTest/Mock/DOM/VKP/impl/LeverAdresRepository.cls.xml
===================================================================
diff -u -r48517 -r48522
--- vhTest/Mock/DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48517)
+++ vhTest/Mock/DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48522)
@@ -23,7 +23,8 @@
 </Method>
 
 <Method name="Bewaar">
-<Implementation><![CDATA[	do ..VerwerkMethodCall("Bewaar")
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,LeverAdres:DOM.VKP.LeverAdres</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Bewaar",Klant,LeverAdres)
 ]]></Implementation>
 </Method>
 
Index: DOM/VKP/impl/LeverAdresRepository.cls.xml
===================================================================
diff -u -r48517 -r48522
--- DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48517)
+++ DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48522)
@@ -9,7 +9,43 @@
 </Method>
 
 <Method name="Bewaar">
-<Implementation><![CDATA[	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("Bewaar() nog niet geïmplementeerd"))
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,LeverAdres:DOM.VKP.LeverAdres</FormalSpec>
+<Implementation><![CDATA[
+	try {
+		#dim KlantIndexKKL As %String = ..GeefKlantIndexKKL($Piece(Klant.GeefID(),"||",2))
+		#dim LeverAdresId As %Integer = LeverAdres.ID
+		#dim AdresNode As %String = ""
+		Set $Piece(AdresNode,"\",1) = LeverAdresId
+		Set $Piece(AdresNode,"\",2) = LeverAdres.GeefNaam()
+		Set $Piece(AdresNode,"\",3) = LeverAdres.GeefToenaam()
+		Set $Piece(AdresNode,"\",4) = LeverAdres.GeefAanspreking()
+		Set $Piece(AdresNode,"\",5) = LeverAdres.GeefStraat()
+		Set $Piece(AdresNode,"\",6) = LeverAdres.GeefPostcode()
+		Set $Piece(AdresNode,"\",7) = LeverAdres.GeefGemeente()
+		Set $Piece(AdresNode,"\",8) = LeverAdres.GeefLand().GeefID()
+		Set $Piece(AdresNode,"\",9) = LeverAdres.GeefTaal()
+		Set $Piece(AdresNode,"\",13) = LeverAdres.GeefTelefoon()
+		Set $Piece(AdresNode,"\",23) = LeverAdres.GeefVolmacht()
+		Set $Piece(AdresNode,"\",24) = LeverAdres.GeefOpmerking1()
+		Set $Piece(AdresNode,"\",25) = LeverAdres.GeefOpmerking2()
+		Set $Piece(AdresNode,"\",26) = LeverAdres.GeefVerzendingWijze()	
+		Set $Piece(AdresNode,"\",12) = "L"
+		Set $Piece(AdresNode,"\",19) = "."
+		Set $Piece(AdresNode,"\",29) = LeverAdres.GeefAxLeveradresId()
+		#dim AdresId As %String = $I(^KKL.AdresD)
+		Set $Piece(AdresNode,"\",28) = AdresId
+		#dim Node As %String = "L"_$$$LeftPadding(LeverAdresId,3," ")
+		Set ^KKL(KlantIndexKKL,Node) = AdresNode
+	 	
+		Set $Piece(^KKL(KlantIndexKKL,0),"\",19) = 1
+		
+		#dim PartijId As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID($Piece(Klant.GeefID(),"||",2))
+		Set ^KKL.AdresI("KlantId_AdresVolgNr",AdresId) = $listbuild(PartijId,LeverAdresId)
+	 	Do ##class(DOM.VKP.VanHoeckeKlant.impl.EventRaiser).%New().RaiseKlantAdresGewijzigdEvent(AdresId)	
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("LeverAdres '"_LeverAdres.GeefNaam()_" "_LeverAdres.GeefAanspreking()_"' kan niet bewaard worden"))
+	}
 ]]></Implementation>
 </Method>
 
@@ -86,6 +122,23 @@
 	Quit ..GeefViaKlantIdEnAdresVolgnummer("K||"_$p(ResultSet.GetData(1),"||",1),##class(TECH.StringUtils).StripAllExceptNumeric($p(ResultSet.GetData(1),"||",2)))
 ]]></Implementation>
 </Method>
+
+<Method name="GeefKlantIndexKKL">
+<FormalSpec>KlantNummer:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim PartijID As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KlantNummer)
+	#dim Partij As DOM.PARTIJ.Partij = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(PartijID)
+	#dim KlantIndexKKL As %String = ""
+	If $Data(^KK1(KlantNummer)) {
+		Set KlantIndexKKL = ^KK1(KlantNummer)
+	}Else{
+		Set KlantIndexKKL = $$COMPRES^KLANT(Partij.GeefNaam(),KlantNummer)
+	}
+	Quit KlantIndexKKL
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r48495 -r48522
--- AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48495)
+++ AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48522)
@@ -28,6 +28,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="LeveradresRepository">
+<Type>DOM.VKP.impl.LeverAdresRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="LandRepository">
 <Type>DOM.common.Locatie.impl.LandRepository</Type>
 <Private>1</Private>
@@ -39,7 +44,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>PartijApi:DOM.PARTIJ.PartijAPI,VerkoopApi:DOM.VKP.VerkoopAPI,KlantLevenCyclusService:APPS.KlantBeheer.KlantLevenCyclusService,LandRepository:DOM.common.Locatie.impl.LandRepository,Logger:vhLib.Logger,LeverAdresFactory:DOM.VKP.impl.LeverAdresFactory</FormalSpec>
+<FormalSpec>PartijApi:DOM.PARTIJ.PartijAPI,VerkoopApi:DOM.VKP.VerkoopAPI,KlantLevenCyclusService:APPS.KlantBeheer.KlantLevenCyclusService,LandRepository:DOM.common.Locatie.impl.LandRepository,Logger:vhLib.Logger,LeverAdresFactory:DOM.VKP.impl.LeverAdresFactory,LeveradresRepository:DOM.VKP.impl.LeverAdresRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -51,6 +56,7 @@
 	Set ..KlantLevenCyclusService = $$$Inject(KlantLevenCyclusService,##class(APPS.KlantBeheer.KlantLevenCyclusService).%New())
 	Set ..LeverAdresFactory = $$$Inject(LeverAdresFactory,##class(DOM.VKP.impl.LeverAdresFactory).%New())
 	Set ..LandRepository  = $$$Inject(LandRepository,##class(DOM.common.Locatie.impl.LandRepository).%New())
+	Set ..LeveradresRepository = $$$Inject(LeveradresRepository,##class(DOM.VKP.impl.LeverAdresRepository).%New())
 	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New())
 	Quit $$$OK
 ]]></Implementation>
@@ -93,6 +99,7 @@
 	
 	Do:($$$Not(""=PrimairAdres.GeefVerzendingWijze())) Klant.ZetVerzendingWijze(PrimairAdres.GeefVerzendingWijze())
 	Do Klant.Save()
+	Do ..ZetLeverAdressenBestaandeKlant(Klant, Cust)
 ]]></Implementation>
 </Method>
 
@@ -306,6 +313,88 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetLeverAdressenNieuweKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[
+	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
+	While PostalAddressIterator.HasNext() {
+		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
+		If ..RolesContains(Address.Role ,"Delivery" ) {
+			#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
+			#dim InsertOfUpdate As %String = "Insert"
+			Do ..ZetNieuwLeverAdres(Adres, Address, Cust, InsertOfUpdate)
+			Do Klant.VoegToeLeverAdres(Adres)
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ZetLeverAdressenBestaandeKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[
+	#dim CacheLeverAdresLijst As %ListOfObjects = Klant.GeefLeverAdressen()
+	Set CacheIdLeverAdresLijst = ##class(%ListOfDataTypes).%New()
+	#dim N As %Integer
+	#dim CacheIdLeverAdresCount As %Integer = 0
+	For N=1:1:CacheLeverAdresLijst.Count() {
+		Set CacheIdLeverAdresCount = CacheIdLeverAdresCount + 1
+		#dim CacheIdLeverAdres As DOM.VKP.LeverAdres = CacheLeverAdresLijst.GetAt(CacheIdLeverAdresCount)
+		Do CacheIdLeverAdresLijst.Insert(CacheIdLeverAdres.ID)
+	}
+	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
+	While PostalAddressIterator.HasNext() {
+		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
+		If ..RolesContains(Address.Role ,"Delivery" ) {
+			#dim CacheLeverAdresId As %String = ##class(TECH.StringUtils).LeftTrim($Extract($Piece(Address.TransporterAuth,"$$##",2),2,*))
+			#dim IsNieuwLeverAdres As %Boolean
+			#dim InsertOfUpdate As %String
+			Set IsNieuwLeverAdres = $$$If($$$Not(##class(TECH.ListUtils).Contains(CacheIdLeverAdresLijst,CacheLeverAdresId)),$$$True,$$$False)
+			If IsNieuwLeverAdres {
+				#dim NieuwAdres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
+				Set InsertOfUpdate = "Insert"
+				Do ..ZetNieuwLeverAdres(NieuwAdres, Address, Cust, InsertOfUpdate)
+				Do Klant.VoegToeLeverAdres(NieuwAdres)
+			} Else {
+				#Dim Node As %String = "L"_##class(TECH.StringUtils).AddLeadingSpace(CacheLeverAdresId,3)
+				#dim BestaandLeverAdres As DOM.VKP.LeverAdres = Klant.GeefSpecifiekAdres(Node)
+				#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
+				Set InsertOfUpdate = "Update"
+				Do Adres.ZetNaam($$$If($$$HasLength(Address.Description),$Piece(Address.Description," ",1),BestaandLeverAdres.GeefNaam()))
+				Do Adres.ZetAanspreking($$$If($$$HasLength(Address.Description),$Piece(Address.Description," ",2),BestaandLeverAdres.GeefAanspreking()))
+				Do Adres.ZetStraat($$$If($$$HasLength(Address.Street),Address.Street,BestaandLeverAdres.GeefStraat()))
+				Do Adres.ZetPostcode($$$If($$$HasLength(Address.ZipCode),Address.ZipCode,BestaandLeverAdres.GeefPostcode()))
+				Do Adres.ZetGemeente($$$If($$$HasLength(Address.City),Address.City,BestaandLeverAdres.GeefGemeente()))
+				Do Adres.ZetLandNr($$$If($$$HasLength(Address.CountryRegionId),..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefID(),BestaandLeverAdres.GeefLandNr()))
+				Do Adres.ZetTaal($$$If($$$HasLength(Cust.LanguageId),..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId),Klant.GeefTaal()))
+				Do Adres.ZetVerzendingWijze($$$If($$$HasLength(Address.DlvModeId),..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, InsertOfUpdate),BestaandLeverAdres.GeefVerzendingWijze()))
+				Do Adres.ZetOpmerking1($$$If($$$HasLength(Address.Nota1External),Address.Nota1External,BestaandLeverAdres.GeefOpmerking1()))
+				Do Adres.ZetOpmerking2($$$If($$$HasLength(Address.Nota2External),Address.Nota2External,BestaandLeverAdres.GeefOpmerking2()))
+				Do Adres.ZetType($$$If($$$HasLength(Address.Role),..AxToAdminUtils.ConvertLeverAdresType(Address.Role),BestaandLeverAdres.GeefType()))
+				Do Adres.ZetAxLeveradresId($$$If($$$HasLength(Address.LocationId),Address.LocationId,BestaandLeverAdres.GeefAxLeveradresId()))
+				Do Adres.ZetVolmacht($$$If($$$HasLength(Address.TransporterAuth),$Piece(Address.TransporterAuth,"$$##",1),BestaandLeverAdres.GeefVolmacht()))
+				Set Adres.ID = CacheLeverAdresId
+				Do ..LeveradresRepository.Bewaar(Klant, Adres)
+			}
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ZetNieuwLeverAdres">
+<FormalSpec>Adres:DOM.VKP.LeverAdres,Address:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	Set Adres = ..ZetGemeenschappelijkePropertiesOpAdres(Adres, Address, Cust, InsertOfUpdate)
+	Do Adres.ZetOpmerking1(Address.Nota1External)
+	Do Adres.ZetOpmerking2(Address.Nota2External)
+	Do Adres.ZetType(..AxToAdminUtils.ConvertLeverAdresType(Address.Role))
+	Do Adres.ZetAxLeveradresId(Address.LocationId)
+	Do Adres.ZetVolmacht($Piece(Address.TransporterAuth,"$$##",1))
+	Quit Adres
+]]></Implementation>
+</Method>
+
 <Method name="ZetGemeenschappelijkePropertiesOpAdres">
 <FormalSpec>Adres:DOM.VKP.LeverAdres,Address:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
 <Private>1</Private>
@@ -322,28 +411,6 @@
 	Quit Adres
 ]]></Implementation>
 </Method>
-
-<Method name="ZetLeverAdressenNieuweKlant">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
-	While PostalAddressIterator.HasNext() {
-		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
-		If ..RolesContains(Address.Role ,"Delivery" ) {
-			#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
-			#dim InsertOfUpdate As %String = "Insert"
-			Set Adres = ..ZetGemeenschappelijkePropertiesOpAdres(Adres, Address, Cust, InsertOfUpdate)
-			Do Adres.ZetOpmerking1(Address.Nota1External)
-			Do Adres.ZetOpmerking2(Address.Nota2External)
-			Do Adres.ZetType(..AxToAdminUtils.ConvertLeverAdresType(Address.Role))
-			Do Adres.ZetAxLeveradresId(Address.LocationId)
-			Do Adres.ZetVolmacht(Address.TransporterAuth)
-			Do Klant.VoegToeLeverAdres(Adres)
-		}
-	}
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: DOM/VKP/impl/DataM/DataMKlantNative.cls.xml
===================================================================
diff -u -r48257 -r48522
--- DOM/VKP/impl/DataM/DataMKlantNative.cls.xml	(.../DataMKlantNative.cls.xml)	(revision 48257)
+++ DOM/VKP/impl/DataM/DataMKlantNative.cls.xml	(.../DataMKlantNative.cls.xml)	(revision 48522)
@@ -441,7 +441,6 @@
 - "B" 			= BezoekAdres
 - "F"			= FacturatieAdres</Description>
 <FormalSpec>AdresType:%String</FormalSpec>
-<Private>1</Private>
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="DOM.common.Adres"</ReturnTypeParams>
 <Implementation><![CDATA[
@@ -496,7 +495,6 @@
 
 <Method name="GeefSpecifiekAdres">
 <FormalSpec>Node:%String</FormalSpec>
-<Private>1</Private>
 <ReturnType>DOM.common.Adres</ReturnType>
 <Implementation><![CDATA[
 	#dim Adres As DOM.common.Adres = ""
@@ -800,6 +798,7 @@
 	Set $Piece(AdresNode,"\",8) = LeverAdres.GeefLand().GeefID()
 	Set $Piece(AdresNode,"\",9) = LeverAdres.GeefTaal()
 	Set $Piece(AdresNode,"\",13) = LeverAdres.GeefTelefoon()
+	Set $Piece(AdresNode,"\",23) = LeverAdres.GeefVolmacht()
 	Set $Piece(AdresNode,"\",24) = LeverAdres.GeefOpmerking1()
 	Set $Piece(AdresNode,"\",25) = LeverAdres.GeefOpmerking2()
 	Set $Piece(AdresNode,"\",26) = LeverAdres.GeefVerzendingWijze()	
Index: vhTest/Fake/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r48495 -r48522
--- vhTest/Fake/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48495)
+++ vhTest/Fake/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48522)
@@ -19,6 +19,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetLeverAdressenBestaandeKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="ZetLeverAdressenNieuweKlant">
 <FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Mock/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r48261 -r48522
--- vhTest/Mock/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48261)
+++ vhTest/Mock/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48522)
@@ -27,6 +27,18 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("RolesContains",Roles,Name)
 ]]></Implementation>
 </Method>
+
+<Method name="ZetLeverAdressenBestaandeKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLeverAdressenBestaandeKlant",Klant,Cust)
+]]></Implementation>
+</Method>
+
+<Method name="ZetLeverAdressenNieuweKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLeverAdressenNieuweKlant",Klant,Cust)
+]]></Implementation>
+</Method>
 </Class>