Index: AXimpl/Admin/STAT/Invoice/Processor.cls.xml
===================================================================
diff -u -r49531 -r49533
--- AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49531)
+++ AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49533)
@@ -46,14 +46,14 @@
 		#dim Maand As %String = $Piece(..GeefDag1LopendeMaand(),"-",1)_"."_$Piece(..GeefDag1LopendeMaand(),"-",2)_" "
 		If $$$Not(..IsNietMeeTeNemenKlant(KlantNr)) {
 			If $$$Not(KlantNr = VorigeKlantNr) {
-				Do ..KillSubscripts(0, 0, 1, 0, KlantNr,, Maand)
+				Do ..KillSubscripts("KlantMaandRec", KlantNr,, Maand)
 				If $$$Not(ProductBestaatNiet) {
-					Do ..KillSubscripts(0, 0, 0, 1, KlantNr, ProductId, Maand)
+					Do ..KillSubscripts("KlantProductMaandRec", KlantNr, ProductId, Maand)
 				}
 			}
 			If ($$$Not(ProductId = VorigProductId) && $$$Not(ProductBestaatNiet)) {
-				Do ..KillSubscripts(0, 0, 0, 1, KlantNr, ProductId, Maand)
-				// Kill ProductMaandRec KSTPR(P,0,M)
+				Do ..KillSubscripts("KlantProductMaandRec", KlantNr, ProductId, Maand)
+				// Kill ProductMaandRec KSTPR(P,0,M) => ("ProductMaandRec", ProductId, Maand)
 			}
 			Do ..ProcessKlantLastInfoRec(Line, KlantNr)
 			Do ..ProcessKlantMaandRec(Line, KlantNr, Maand)
@@ -71,19 +71,16 @@
 </Method>
 
 <Method name="KillSubscripts">
-<FormalSpec>KlantLastInfo:%Boolean=0,KlantProductLastInfo:%Boolean=0,KlantMaandRec:%Boolean=0,KlantProductMaandRec:%Boolean=0,KlantNr:%Integer,ProductId:%Integer=0,Maand:%String=""</FormalSpec>
+<FormalSpec>Variatie:%String,KlantNr:%Integer=0,ProductId:%Integer=0,Maand:%String=""</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	If KlantLastInfo {
+	If (Variatie = "KlantLastInfo") {
 		Kill ^KSTKL(KlantNr,0,0)
-	} 
-	If KlantProductLastInfo {
+	} ElseIf (Variatie = "KlantProductLastInfo") {
 		Kill ^KSTKL(KlantNr,ProductId,0)
-	} 
-	If KlantMaandRec {
+	} ElseIf (Variatie = "KlantMaandRec") {
 		Kill ^KSTKL(KlantNr,0,Maand)
-	} 
-	If KlantProductMaandRec {
+	} ElseIf (Variatie = "KlantProductMaandRec") {
 		Kill ^KSTKL(KlantNr,ProductId,Maand)
 	}
 ]]></Implementation>
@@ -104,7 +101,7 @@
 		#dim DatumLine As %Date = ##class(TECH.DateTime).TextToDate(ConvertedInvoiceDateLine)
 		#dim EditNodigKlantLastInfoRec As %Boolean = DatumLine >= DatumKlantLastInfoRec
 		If EditNodigKlantLastInfoRec {
-			Do ..KillSubscripts(1, 0, 0, 0, KlantNr)
+			Do ..KillSubscripts("KlantLastInfo", KlantNr)
 			Set KlantLastInfoRec = $Get(^KSTKL(KlantNr,0,0),"")
 			Set $Piece(KlantLastInfoRec,"\",1) = ConvertedInvoiceDateLine
 			Set ^KSTKL(KlantNr,0,0) = KlantLastInfoRec
@@ -145,7 +142,7 @@
 		#dim DatumLine As %Date = ##class(TECH.DateTime).TextToDate(ConvertedInvoiceDateLine)
 		#dim EditNodigKlantProductLastInfoRec As %Boolean = DatumLine >= DatumKlantProductLastInfoRec
 		If EditNodigKlantProductLastInfoRec {
-			Do ..KillSubscripts(0, 1, 0, 0, KlantNr, ProductId)
+			Do ..KillSubscripts("KlantProductLastInfo", KlantNr, ProductId)
 			Set KlantProductLastInfoRec = $Get(^KSTKL(KlantNr,ProductId,0),"")
 			Set $Piece(KlantProductLastInfoRec,"\",1) = ConvertedInvoiceDateLine
 			Set $Piece(KlantProductLastInfoRec,"\",2) = Line.LineAmount