Index: cFA13.mac.rou
===================================================================
diff -u -r38032 -r38073
--- cFA13.mac.rou	(.../cFA13.mac.rou)	(revision 38032)
+++ cFA13.mac.rou	(.../cFA13.mac.rou)	(revision 38073)
@@ -43,9 +43,12 @@
 81 S @%Q1=0
  S $P(B(1),D,2)=$$TrimEndOfText^vhLib($$TrimBeginOfText^vhLib($P(B(1),D,2)))
  S @("^"_Q_"KL(KI1,KI2)")=B(1),X=^(0) I '$P(X,D,19) S ^(0)=$P(X,D,1,18)_D_1_D_$P(X,D,20,99)
- S $P(@("^"_Q_"KL(KI1,KI2)"),"\",28)=$I(^KKL.AdresD)
  New KlantId set KlantId = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID($piece(KI1," ",2))
- Do ##class(DOM.VKP.VanHoeckeKlant.impl.EventRaiser).%New().RaiseKlantAdresGemaaktEvent(KlantId,$piece($replace(KI2," ",""),"L",2))
+ New AdresVolgNr set AdresVolgNr = $piece($replace(KI2," ",""),"L",2)
+ New AdresId set AdresId = $I(^KKL.AdresD)
+ Set $P(@("^"_Q_"KL(KI1,KI2)"),"\",28)= AdresId
+ Set ^KKL.AdresI("KlantId_AdresVolgNr",AdresId)=$listbuild(KlantId,AdresNr)
+ Do ##class(DOM.VKP.VanHoeckeKlant.impl.EventRaiser).%New().RaiseKlantAdresGemaaktEvent(KlantId,AdresVolgNr)
 83 S @%Q1=1,SW1=1
  ;
 YZ Q
Index: cFA14.mac.rou
===================================================================
diff -u -r37979 -r38073
--- cFA14.mac.rou	(.../cFA14.mac.rou)	(revision 37979)
+++ cFA14.mac.rou	(.../cFA14.mac.rou)	(revision 38073)
@@ -16,9 +16,12 @@
 15 S FP=2220+F60 W @F,@F0 R K G 13:K?.E1C.E,YZ:K="-",21:K="W",13:K'="V" W $P($T(T5),";",2)
  ;
 16 S FP=2303+F60 W @F,@F1,$P($T(T6),";",2),@F0 R K G 16:K?.E1C.E,13:K="-",YZ:K=",",16:K'="V"
-17 S @%Q1=0 K @("^"_Q_"KL(KI1,KI2)") 
+17 S @%Q1=0 
    New KlantId set KlantId = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID($piece(KI1," ",2))
-   Do ##class(DOM.VKP.VanHoeckeKlant.impl.EventRaiser).%New().RaiseKlantAdresVerwijderdEvent(KlantId,$piece($replace(KI2," ",""),"L",2))
+   New AdresVolgNr set AdresVolgNr = $piece($replace(KI2," ",""),"L",2)
+   Do ##class(DOM.VKP.VanHoeckeKlant.impl.EventRaiser).%New().RaiseKlantAdresVerwijderdEvent(KlantId,AdresVolgNr)
+   Kill ^KKL.AdresI("KlantId_AdresVolgNr",$piece(@("^"_Q_"KL(KI1,KI2)"),"\",28))
+   Kill @("^"_Q_"KL(KI1,KI2)") 
    I $E($N(@("^"_Q_"KL(KI1,""L"")")),1)'="L" S ^(0)=$P(^(0),D,1,18)_D_D_$P(^(0),D,20,99),@%Q1=1
 19 X ^cTXT(0,"N",208) R K G YZ
  ;