Index: AXimpl/Admin/STAT/Invoice/Processor.cls.xml
===================================================================
diff -u -r49539 -r49541
--- AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49539)
+++ AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49541)
@@ -77,6 +77,7 @@
 			}
 			// SETTERS
 			Do ..ProcessKlantLastInfoRec(Line, KlantNr)
+			Do ..ProcessProductLastInfoRec(Line, ProductId)
 			Do ..ProcessKlantMaandRec(Line, KlantNr, Maand)
 			If $$$Not(ProductBestaatNiet) {
 				Do ..ProcessKlantProductLastInfoRec(Line, KlantNr, ProductId)
@@ -96,14 +97,16 @@
 <FormalSpec>Variatie:%String,KlantNr:%Integer=0,ProductId:%Integer=0,Maand:%String=""</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	If (Variatie = "KlantLastInfo") {
+	If (Variatie = "KlantLastInfoRec") {
 		Kill ^KSTKL(KlantNr,0,0)
-	} ElseIf (Variatie = "KlantProductLastInfo") {
+	} ElseIf (Variatie = "KlantProductLastInfoRec") {
 		Kill ^KSTKL(KlantNr,ProductId,0)
 	} ElseIf (Variatie = "KlantMaandRec") {
 		Kill ^KSTKL(KlantNr,0,Maand)
 	} ElseIf (Variatie = "KlantProductMaandRec") {
 		Kill ^KSTKL(KlantNr,ProductId,Maand)
+	} ElseIf (Variatie = "ProductLastInfoRec") {
+		Kill ^KSTPR(ProductId,0,0)
 	} ElseIf (Variatie = "ProductMaandRec") {
 		Kill ^KSTPR(ProductId,0,Maand)
 	} ElseIf (Variatie = "ProductKlantMaandRec") {
@@ -127,7 +130,7 @@
 		#dim DatumLine As %Date = ##class(TECH.DateTime).TextToDate(ConvertedInvoiceDateLine)
 		#dim EditNodigKlantLastInfoRec As %Boolean = DatumLine >= DatumKlantLastInfoRec
 		If EditNodigKlantLastInfoRec {
-			Do ..KillSubscript("KlantLastInfo", KlantNr)
+			Do ..KillSubscript("KlantLastInfoRec", KlantNr)
 			Set KlantLastInfoRec = $Get(^KSTKL(KlantNr,0,0),"")
 			Set $Piece(KlantLastInfoRec,"\",1) = ConvertedInvoiceDateLine
 			Set ^KSTKL(KlantNr,0,0) = KlantLastInfoRec
@@ -136,6 +139,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ProcessProductLastInfoRec">
+<FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line,ProductId:%Integer</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim BestaatProductLastInfoRec As %Boolean = $Data(^KSTPR(ProductId,0,0))
+	#dim ProductLastInfoRec As %String = $Get(^KSTPR(ProductId,0,0),"")
+	#dim ConvertedInvoiceDateLine As %String = ..DateTimeApi.GeefDatumInPuntNotatie(..DateTimeApi.TextToDate($Piece(Line.InvoiceDate," ",1)))
+	If $$$Not(BestaatProductLastInfoRec) {
+		Set $Piece(ProductLastInfoRec,"\",1) = ConvertedInvoiceDateLine
+		Set ^KSTPR(ProductId,0,0) = ProductLastInfoRec
+	} Else {
+		#dim DatumProductLastInfoRec As %Date = ##class(TECH.DateTime).TextToDate($Piece(ProductLastInfoRec,"\",1))
+		#dim DatumLine As %Date = ##class(TECH.DateTime).TextToDate(ConvertedInvoiceDateLine)
+		#dim EditNodigProductLastInfoRec As %Boolean = DatumLine >= DatumProductLastInfoRec
+		If EditNodigProductLastInfoRec {
+			Do ..KillSubscript("ProductLastInfoRec",, ProductId)
+			Set ProductLastInfoRec = $Get(^KSTPR(ProductId,0,0),"")
+			Set $Piece(ProductLastInfoRec,"\",1) = ConvertedInvoiceDateLine
+			Set ^KSTPR(ProductId,0,0) = ProductLastInfoRec
+		}
+	}
+]]></Implementation>
+</Method>
+
 <Method name="ProcessKlantMaandRec">
 <FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line,KlantNr:%Integer,Maand:%String</FormalSpec>
 <Private>1</Private>
@@ -168,7 +195,7 @@
 		#dim DatumLine As %Date = ##class(TECH.DateTime).TextToDate(ConvertedInvoiceDateLine)
 		#dim EditNodigKlantProductLastInfoRec As %Boolean = DatumLine >= DatumKlantProductLastInfoRec
 		If EditNodigKlantProductLastInfoRec {
-			Do ..KillSubscript("KlantProductLastInfo", KlantNr, ProductId)
+			Do ..KillSubscript("KlantProductLastInfoRec", KlantNr, ProductId)
 			Set KlantProductLastInfoRec = $Get(^KSTKL(KlantNr,ProductId,0),"")
 			Set $Piece(KlantProductLastInfoRec,"\",1) = ConvertedInvoiceDateLine
 			Set $Piece(KlantProductLastInfoRec,"\",2) = Line.LineAmount
@@ -208,40 +235,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ProcessKSTPR">
-<FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line,KlantNr:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	/*
-	#dim PeriodeSubscript As %String = $Piece(Line.InvoiceDate,"-",1)_"."_$Piece(Line.InvoiceDate,"-",2)_" "
-	#dim AdminProductId As %String = ..GetAdminProductId(Line)
-		
-	#dim ProductLastInfoRec As %String = $Get(^KSTPR(AdminProductId,0,0),"")
-	Set $Piece(ProductLastInfoRec,"\",1) = $$EXTDATE^vhLib.DataType(Line.InvoiceDate,"DD.MM.JJ")
-	Set $Piece(ProductLastInfoRec,"\",2) = Line.LineAmount
-	Set $Piece(ProductLastInfoRec,"\",3) = ..GeefVerkoopEenheid(Line)
-	Set $Piece(ProductLastInfoRec,"\",4) = "EUR"
-	Set $Piece(ProductLastInfoRec,"\",5) = 1
-	Set ^KSTPR(AdminProductId,0,0) = ProductLastInfoRec
-	
-	#dim ProductKlantLastInfoRec As %String = $Get(^KSTPR(AdminProductId,KlantNr,0),"")
-	Set $Piece(ProductKlantLastInfoRec,"\",1) = $$EXTDATE^vhLib.DataType(Line.InvoiceDate,"DD.MM.JJ")
-	Set $Piece(ProductKlantLastInfoRec,"\",2) = Line.LineAmount
-	Set $Piece(ProductKlantLastInfoRec,"\",3) = ..GeefVerkoopEenheid(Line)
-	Set $Piece(ProductKlantLastInfoRec,"\",4) = "EUR"
-	Set $Piece(ProductKlantLastInfoRec,"\",5) = 1
-	Set ^KSTPR(AdminProductId,KlantNr,0) = ProductKlantLastInfoRec
-	
-	#dim ProductKlantRec As %String = $Get(^KSTPR(AdminProductId,KlantNr,PeriodeSubscript),"")
-	Set $Piece(ProductKlantRec,"\",1) = $Piece(ProductKlantRec,"\",1) + Line.InventQty
-	Set $Piece(ProductKlantRec,"\",2) = $Piece(ProductKlantRec,"\",2) + 1
-	Set $Piece(ProductKlantRec,"\",3) = ..GeefMarge(Line)
-	Set $Piece(ProductKlantRec,"\",4) = $Piece(ProductKlantRec,"\",4) + (Line.InventQty*Line.LineAmount)
-	Set ^KSTPR(AdminProductId,KlantNr,PeriodeSubscript) = ProductRec
-	*/
-]]></Implementation>
-</Method>
-
 <Method name="ProcessKSPW">
 <FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line</FormalSpec>
 <Private>1</Private>