Index: AXimpl/Admin/STAT/Invoice/Processor.cls.xml
===================================================================
diff -u -r49682 -r49687
--- AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49682)
+++ AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49687)
@@ -53,52 +53,25 @@
 
 <Method name="Process">
 <Implementation><![CDATA[
-	#dim VorigeKlantNr As %Integer = 0
-	#dim VorigProductId As %Integer = 0
-	#dim mdProductId As TECH.MultiDim
-	#dim mdKlantNr As TECH.MultiDim
-	Kill mdProductId
-	Kill mdKlantNr
+	#dim Maand As %String = $Piece(..InvoiceDate,"-",1)_"."_$Piece(..InvoiceDate,"-",2)_" "
+	Do ..KillSubscript("MaandRec",,, Maand) // KILLed alles volgens maand. De LastInfo-kills => Zie ...InfoRec()-methods
 	While ..InvoiceLineIterator.HasNext() {
-		// VOLGORDE ITERATOR IS = KlantNr oplopend en per KlantNr ProductId oplopend !!!
 		#dim Line As AXimpl.Admin.STAT.Invoice.Line = ..InvoiceLineIterator.Next()
 		#dim KlantNr As %Integer = +Line.InvoiceAccount
 		#dim ProductId As %Integer = ..GetAdminProductId(Line)
-		If $$$Not(Line.Currency = "EUR") {
-			Do ..LogCurrencyError(Line, KlantNr, ProductId)
-		}
 		#dim ProductBestaatNiet As %Boolean = (ProductId = 0)
-		#dim Maand As %String = $Piece(..InvoiceDate,"-",1)_"."_$Piece(..InvoiceDate,"-",2)_" "
 		If $$$Not(..IsNietMeeTeNemenKlant(KlantNr)) {
-			// KILLS (op LastInfo-kills na => In ...InfoRec()-methods)
-			If $$$Not(KlantNr = VorigeKlantNr) {
-				Do ..KillSubscript("KlantMaandRec", KlantNr,, Maand)
-				If $$$Not(ProductBestaatNiet) {
-					Do ..KillSubscript("KlantProductMaandRec", KlantNr, ProductId, Maand)
-				}
-			}
-			If ($$$Not(ProductId = VorigProductId) && $$$Not(ProductBestaatNiet)) {
-				Do ..KillSubscript("KlantProductMaandRec", KlantNr, ProductId, Maand)
-				If $$$Not($Data(mdProductId(ProductId))) {
-					Do ..KillSubscript("ProductMaandRec",, ProductId, Maand)
-					Set mdProductId(ProductId)=""
-					If $$$Not($Data(mdKlantNr(KlantNr))) {
-						Do ..KillSubscript("ProductKlantMaandRec", KlantNr, ProductId, Maand)
-						Set mdKlantNr(KlantNr)=""
-					}
-				}
-			}
-			// SETTERS
 			Do ..ProcessKlantLastInfoRec(Line, KlantNr)
 			If $$$Not(ProductBestaatNiet) {
 				Do ..ProcessKlantProductLastInfoRec(Line, KlantNr, ProductId) // Ook ProductKlantLastInfoRec
 				Do ..ProcessKlantProductMaandRec(Line, KlantNr, ProductId, Maand) // Ook ProductMaandRec EN ProductKlantMaandRec
 				Do ..ProcessProductLastInfoRec(Line, ProductId)
 			}
 			Do ..SetLastProcessedRecord(Line.RecId)
-			Set VorigeKlantNr = KlantNr
-			Set VorigProductId = ProductId
 		}
+		If $$$Not(Line.Currency = "EUR") {
+			Do ..LogCurrencyError(Line, KlantNr, ProductId)
+		}
 	}
 ]]></Implementation>
 </Method>
@@ -107,22 +80,30 @@
 <FormalSpec>Variatie:%String,KlantNr:%Integer=0,ProductId:%Integer=0,Maand:%String=""</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	If (Variatie = "KlantMaandRec") {
-		Kill ^KSTKL(KlantNr,0,Maand)
-	} ElseIf (Variatie = "KlantProductMaandRec") {
-		Kill ^KSTKL(KlantNr,ProductId,Maand)
-	} ElseIf (Variatie = "ProductMaandRec") {
-		Kill ^KSTPR(ProductId,0,Maand)
-	} ElseIf (Variatie = "ProductKlantMaandRec") {
-		Kill ^KSTPR(ProductId,KlantNr,Maand)
-	} ElseIf (Variatie = "KlantLastInfoRec") {
+	If (Variatie = "KlantLastInfoRec") {
 		Kill ^KSTKL(KlantNr,0,0)
 	} ElseIf (Variatie = "KlantProductLastInfoRec") {
 		Kill ^KSTKL(KlantNr,ProductId,0)
 	} ElseIf (Variatie = "ProductLastInfoRec") {
 		Kill ^KSTPR(ProductId,0,0)
 	} ElseIf (Variatie = "ProductKlantLastInfoRec") {
 		Kill ^KSTPR(ProductId,KlantNr,0)
+	} ElseIf (Variatie = "MaandRec") {
+		#dim NodeKl1, NodeKl2, NodePr1, NodePr2 As %String = ""
+		For  { Set NodeKl1=$Order(^KSTKL(NodeKl1)) Quit:(NodeKl1="")
+			For  { Set NodeKl2=$Order(^KSTKL(NodeKl1,NodeKl2)) Quit:(NodeKl2="")
+				If $$$HasLength($Data(^KSTKL(NodeKl1,NodeKl2,Maand))) {
+					Kill ^KSTKL(NodeKl1,NodeKl2,Maand)
+				}
+			}		
+		}
+		For  { Set NodePr1=$Order(^KSTPR(NodePr1)) Quit:(NodePr1="")
+			For  { Set NodePr2=$Order(^KSTPR(NodePr1,NodePr2)) Quit:(NodePr2="")
+				If $$$HasLength($Data(^KSTPR(NodePr1,NodePr2,Maand))) {
+					Kill ^KSTPR(NodePr1,NodePr2,Maand)
+				}
+			}		
+		}
 	}
 ]]></Implementation>
 </Method>