Index: AXimpl/Admin/STAT/Invoice/Processor.cls.xml
===================================================================
diff -u -r49528 -r49531
--- AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49528)
+++ AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49531)
@@ -53,14 +53,14 @@
 			}
 			If ($$$Not(ProductId = VorigProductId) && $$$Not(ProductBestaatNiet)) {
 				Do ..KillSubscripts(0, 0, 0, 1, KlantNr, ProductId, Maand)
+				// Kill ProductMaandRec KSTPR(P,0,M)
 			}
 			Do ..ProcessKlantLastInfoRec(Line, KlantNr)
 			Do ..ProcessKlantMaandRec(Line, KlantNr, Maand)
 			If $$$Not(ProductBestaatNiet) {
-				Do ..ProcessProductLastInfoRec(Line, KlantNr, ProductId)
+				Do ..ProcessKlantProductLastInfoRec(Line, KlantNr, ProductId)
 				Do ..ProcessKlantProductMaandRec(Line, KlantNr, ProductId, Maand)
 			}
-			;Do ..ProcessKSTPR(Line, KlantNr, ProductId, Maand)
 			;Do ..SetLastProcessedRecord(Line.RecId)
 			Set VorigeKlantNr = KlantNr
 			Set VorigProductId = ProductId
@@ -71,13 +71,13 @@
 </Method>
 
 <Method name="KillSubscripts">
-<FormalSpec>KlantLastInfo:%Boolean=0,ProductLastInfo:%Boolean=0,KlantMaandRec:%Boolean=0,KlantProductMaandRec:%Boolean=0,KlantNr:%Integer,ProductId:%Integer=0,Maand:%String=""</FormalSpec>
+<FormalSpec>KlantLastInfo:%Boolean=0,KlantProductLastInfo:%Boolean=0,KlantMaandRec:%Boolean=0,KlantProductMaandRec:%Boolean=0,KlantNr:%Integer,ProductId:%Integer=0,Maand:%String=""</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	If KlantLastInfo {
 		Kill ^KSTKL(KlantNr,0,0)
 	} 
-	If ProductLastInfo {
+	If KlantProductLastInfo {
 		Kill ^KSTKL(KlantNr,ProductId,0)
 	} 
 	If KlantMaandRec {
@@ -126,33 +126,33 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ProcessProductLastInfoRec">
+<Method name="ProcessKlantProductLastInfoRec">
 <FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line,KlantNr:%Integer,ProductId:%Integer</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim BestaatProductLastInfoRec As %Boolean = $Data(^KSTKL(KlantNr,ProductId,0))
-	#dim ProductLastInfoRec As %String = $Get(^KSTKL(KlantNr,ProductId,0),"")
+	#dim BestaatKlantProductLastInfoRec As %Boolean = $Data(^KSTKL(KlantNr,ProductId,0))
+	#dim KlantProductLastInfoRec As %String = $Get(^KSTKL(KlantNr,ProductId,0),"")
 	#dim ConvertedInvoiceDateLine As %String = ..DateTimeApi.GeefDatumInPuntNotatie(..DateTimeApi.TextToDate($Piece(Line.InvoiceDate," ",1)))
-	If $$$Not(BestaatProductLastInfoRec) {
-		Set $Piece(ProductLastInfoRec,"\",1) = ConvertedInvoiceDateLine
-		Set $Piece(ProductLastInfoRec,"\",2) = Line.LineAmount
-		Set $Piece(ProductLastInfoRec,"\",3) = ..GeefVerkoopEenheid(Line)
-		Set $Piece(ProductLastInfoRec,"\",4) = "EUR"
-		;Set $Piece(ProductLastInfoRec,"\",5) = 1
-		Set ^KSTKL(KlantNr,ProductId,0) = ProductLastInfoRec
+	If $$$Not(BestaatKlantProductLastInfoRec) {
+		Set $Piece(KlantProductLastInfoRec,"\",1) = ConvertedInvoiceDateLine
+		Set $Piece(KlantProductLastInfoRec,"\",2) = Line.LineAmount
+		Set $Piece(KlantProductLastInfoRec,"\",3) = ..GeefVerkoopEenheid(Line)
+		Set $Piece(KlantProductLastInfoRec,"\",4) = "EUR"
+		;Set $Piece(KlantProductLastInfoRec,"\",5) = 1
+		Set ^KSTKL(KlantNr,ProductId,0) = KlantProductLastInfoRec
 	} Else {
-		#dim DatumProductLastInfoRec As %Date = ##class(TECH.DateTime).TextToDate($Piece(ProductLastInfoRec,"\",1))
+		#dim DatumKlantProductLastInfoRec As %Date = ##class(TECH.DateTime).TextToDate($Piece(KlantProductLastInfoRec,"\",1))
 		#dim DatumLine As %Date = ##class(TECH.DateTime).TextToDate(ConvertedInvoiceDateLine)
-		#dim EditNodigProductLastInfoRec As %Boolean = DatumLine >= DatumProductLastInfoRec
-		If EditNodigProductLastInfoRec {
+		#dim EditNodigKlantProductLastInfoRec As %Boolean = DatumLine >= DatumKlantProductLastInfoRec
+		If EditNodigKlantProductLastInfoRec {
 			Do ..KillSubscripts(0, 1, 0, 0, KlantNr, ProductId)
-			Set ProductLastInfoRec = $Get(^KSTKL(KlantNr,ProductId,0),"")
-			Set $Piece(ProductLastInfoRec,"\",1) = ConvertedInvoiceDateLine
-			Set $Piece(ProductLastInfoRec,"\",2) = Line.LineAmount
-			Set $Piece(ProductLastInfoRec,"\",3) = ..GeefVerkoopEenheid(Line)
-			Set $Piece(ProductLastInfoRec,"\",4) = "EUR"
-			;Set $Piece(ProductLastInfoRec,"\",5) = 1
-			Set ^KSTKL(KlantNr,ProductId,0) = ProductLastInfoRec
+			Set KlantProductLastInfoRec = $Get(^KSTKL(KlantNr,ProductId,0),"")
+			Set $Piece(KlantProductLastInfoRec,"\",1) = ConvertedInvoiceDateLine
+			Set $Piece(KlantProductLastInfoRec,"\",2) = Line.LineAmount
+			Set $Piece(KlantProductLastInfoRec,"\",3) = ..GeefVerkoopEenheid(Line)
+			Set $Piece(KlantProductLastInfoRec,"\",4) = "EUR"
+			;Set $Piece(KlantProductLastInfoRec,"\",5) = 1
+			Set ^KSTKL(KlantNr,ProductId,0) = KlantProductLastInfoRec
 		}
 	}
 ]]></Implementation>