Index: AXimpl/Admin/STAT/Invoice/Processor.cls.xml
===================================================================
diff -u -r49447 -r49523
--- AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49447)
+++ AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49523)
@@ -3,57 +3,176 @@
 <Class name="AXimpl.Admin.STAT.Invoice.Processor">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="InvoiceLineIterator">
+<Type>AXimpl.Admin.STAT.Invoice.LineIterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductApi">
+<Type>DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DateTimeApi">
+<Type>TECH.DateTime.DateTimeAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>InvoiceLineIterator:AXimpl.Admin.STAT.Invoice.LineIterator,ProductApi:DOM.PM.ProductAPI,DateTimeApi:TECH.DateTime.DateTimeAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	#dim LastProcessedRecId As %Integer = ..GetLastProcessedRecord()
+	#dim InvoiceDate As %String = ..GeefDag1LopendeMaand()
+	Set ..InvoiceLineIterator = $$$Inject(InvoiceLineIterator, ##class(AXimpl.Admin.STAT.Invoice.LineIterator).%New(,InvoiceDate))
+	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.DomeinContext).Instance().GeefProductAPI())
+	Set ..DateTimeApi = $$$Inject(DateTimeApi, ##class(TECH.Context).Instance().GeefDateTimeAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Process">
 <Implementation><![CDATA[
-	#dim LastProcessedRecord As %Integer = ..GetLastProcessedRecord()
-	Set Iterator = ##class(AXimpl.Admin.STAT.Invoice.LineIterator).%New(,LastProcessedRecord)
-	While Iterator.HasNext() {
-		#dim Line As AXimpl.Admin.STAT.Invoice.Line = Iterator.Next()
-		#dim KlantNr As %String = +Line.InvoiceAccount
+	#dim VorigeKlantNr As %Integer = 0
+	#dim VorigProductId As %Integer = 0
+	While ..InvoiceLineIterator.HasNext() {
+		#dim Line As AXimpl.Admin.STAT.Invoice.Line = ..InvoiceLineIterator.Next()
+		#dim KlantNr As %Integer = +Line.InvoiceAccount
+		#dim ProductId As %Integer = ..GetAdminProductId(Line)
+		#dim ProductBestaatNiet As %Boolean = (ProductId = 0)
+		#dim Maand As %String = $Piece(..GeefDag1LopendeMaand(),"-",1)_"."_$Piece(..GeefDag1LopendeMaand(),"-",2)_" "
 		If $$$Not(..IsNietMeeTeNemenKlant(KlantNr)) {
-			Do ..ProcessKSTKL(Line, KlantNr) // Deze 2 uiteentrekken en elk een eigen query geven => Order By Klant of Product
-			Do ..ProcessKSTPR(Line, KlantNr) // Deze 2 uiteentrekken en elk een eigen query geven => Order By Klant of Product
-			Do ..SetLastProcessedRecord(Line.RecId)
+			If $$$Not(KlantNr = VorigeKlantNr) {
+				Do ..KillSubscripts(0, 0, 1, 0, KlantNr,, Maand)
+				If ($$$Not(ProductId = VorigProductId) && $$$Not(ProductBestaatNiet)) {
+					Do ..KillSubscripts(0, 0, 0, 1, KlantNr, ProductId, Maand)
+				}
+			}
+			Do ..ProcessKlantLastInfoRec(Line, KlantNr)
+			Do ..ProcessKlantMaandRec(Line, KlantNr, Maand)
+			If $$$Not(ProductBestaatNiet) {
+				Do ..ProcessProductLastInfoRec(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
 		}
 	}
-	Do ..ProcessKSPW(Line) // Deze een eigen query geven die optelling doet en pas nadien uitvoeren, als andere 2 statistieken klaar zijn
+	;Do ..ProcessKSPW(Line) // Deze een eigen query geven die optelling doet en pas nadien uitvoeren, als andere 2 statistieken klaar zijn
 ]]></Implementation>
 </Method>
 
-<Method name="ProcessKSTKL">
-<FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line,KlantNr:%String</FormalSpec>
+<Method name="KillSubscripts">
+<FormalSpec>KlantLastInfo:%Boolean=0,ProductLastInfo:%Boolean=0,KlantMaandRec:%Boolean=0,KlantProductMaandRec:%Boolean=0,KlantNr:%Integer,ProductId:%Integer=0,Maand:%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 MaandRec As %String = $Get(^KSTKL(KlantNr,0,PeriodeSubscript),"")	
-	Set $Piece(MaandRec,"\",1)= $Piece(MaandRec,"\",1) + Line.InventQty
-	Set $Piece(MaandRec,"\",2)= $Piece(MaandRec,"\",1) + 1
-	Set $Piece(MaandRec,"\",3)= $Piece(MaandRec,"\",1) + (Line.InventQty*Line.LineAmount)
-	Set ^KSTKL(KlantNr,0,PeriodeSubscript) = MaandRec
-	
-	#dim ProductLastInfoRec As %String = $Get(^KSTKL(KlantNr,AdminProductId,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 ^KSTKL(KlantNr,AdminProductId,0) = ProductLastInfoRec
-	
-	#dim ProductRec As %String = $Get(^KSTKL(KlantNr,AdminProductId,PeriodeSubscript),"")
-	Set $Piece(ProductRec,"\",1) = $Piece(ProductRec,"\",1) + Line.InventQty
-	Set $Piece(ProductRec,"\",2) = $Piece(ProductRec,"\",1) + 1
-	Set $Piece(ProductRec,"\",3) = ..GeefMarge(Line)
-	Set $Piece(ProductRec,"\",4) = $Piece(ProductRec,"\",1) + (Line.InventQty*Line.LineAmount)
-	Set ^KSTKL(KlantNr,AdminProductId,PeriodeSubscript) = ProductRec
+	If KlantLastInfo {
+		Kill ^KSTKL(KlantNr,0,0)
+	} 
+	If ProductLastInfo {
+		Kill ^KSTKL(KlantNr,ProductId,0)
+	} 
+	If KlantMaandRec {
+		Kill ^KSTKL(KlantNr,0,Maand)
+	} 
+	If KlantProductMaandRec {
+		Kill ^KSTKL(KlantNr,ProductId,Maand) // Wordt nog niet altijd op juiste moment gekilld?
+	}
 ]]></Implementation>
 </Method>
 
+<Method name="ProcessKlantLastInfoRec">
+<FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line,KlantNr:%Integer</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim BestaatKlantLastInfoRec As %Boolean = $Data(^KSTKL(KlantNr,0,0))
+	#dim KlantLastInfoRec As %String = $Get(^KSTKL(KlantNr,0,0),"")
+	#dim ConvertedInvoiceDateLine As %String = ..DateTimeApi.GeefDatumInPuntNotatie(..DateTimeApi.TextToDate($Piece(Line.InvoiceDate," ",1)))
+	If $$$Not(BestaatKlantLastInfoRec) {
+		Set $Piece(KlantLastInfoRec,"\",1) = ConvertedInvoiceDateLine
+		Set ^KSTKL(KlantNr,0,0) = KlantLastInfoRec
+	} Else {
+		#dim DatumKlantLastInfoRec As %Date = ##class(TECH.DateTime).TextToDate($Piece(KlantLastInfoRec,"\",1))
+		#dim DatumLine As %Date = ##class(TECH.DateTime).TextToDate(ConvertedInvoiceDateLine)
+		#dim EditNodigKlantLastInfoRec As %Boolean = DatumLine >= DatumKlantLastInfoRec
+		If EditNodigKlantLastInfoRec {
+			Do ..KillSubscripts(1, 0, 0, 0, KlantNr)
+			Set KlantLastInfoRec = $Get(^KSTKL(KlantNr,0,0),"")
+			Set $Piece(KlantLastInfoRec,"\",1) = ConvertedInvoiceDateLine
+			Set ^KSTKL(KlantNr,0,0) = KlantLastInfoRec
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ProcessKlantMaandRec">
+<FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line,KlantNr:%Integer,Maand:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim KlantMaandRec As %String = $Get(^KSTKL(KlantNr,0,Maand),"")
+	Set $Piece(KlantMaandRec,"\",1)= $Piece(KlantMaandRec,"\",1) + Line.InventQty
+	Set $Piece(KlantMaandRec,"\",2)= $Piece(KlantMaandRec,"\",2) + 1
+	Set $Piece(KlantMaandRec,"\",3)= $Piece(KlantMaandRec,"\",3) + Line.LineAmount
+	;Set $Piece(KlantMaandRec,"\",4) = ..GeefMarge(Line)
+	Set ^KSTKL(KlantNr,0,Maand) = KlantMaandRec
+]]></Implementation>
+</Method>
+
+<Method name="ProcessProductLastInfoRec">
+<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 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
+	} 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 ..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
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ProcessKlantProductMaandRec">
+<FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line,KlantNr:%Integer,ProductId:%Integer,Maand:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim KlantProductMaandRec As %String = $Get(^KSTKL(KlantNr,ProductId,Maand),"")
+	Set $Piece(KlantProductMaandRec,"\",1) = $Piece(KlantProductMaandRec,"\",1) + Line.InventQty
+	Set $Piece(KlantProductMaandRec,"\",2) = $Piece(KlantProductMaandRec,"\",2) + 1
+	Set $Piece(KlantProductMaandRec,"\",3) = $Piece(KlantProductMaandRec,"\",3) + Line.LineAmount
+	Set $Piece(KlantProductMaandRec,"\",4) = ..GeefMargeVoorProduct(Line,ProductId,$Piece(KlantProductMaandRec,"\",1),$Piece(KlantProductMaandRec,"\",3))
+	Set ^KSTKL(KlantNr,ProductId,Maand) = KlantProductMaandRec
+]]></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)
 		
@@ -67,9 +186,9 @@
 	
 	#dim ProductRec As %String = $Get(^KSTPR(AdminProductId,0,PeriodeSubscript),"")
 	Set $Piece(ProductRec,"\",1) = $Piece(ProductRec,"\",1)+Line.InventQty
-	Set $Piece(ProductRec,"\",2) = $Piece(ProductRec,"\",1)+1
+	Set $Piece(ProductRec,"\",2) = $Piece(ProductRec,"\",2)+1
 	Set $Piece(ProductRec,"\",3) = ..GeefMarge(Line)
-	Set $Piece(ProductRec,"\",4) = $Piece(ProductRec,"\",1)+(Line.InventQty*Line.LineAmount)
+	Set $Piece(ProductRec,"\",4) = $Piece(ProductRec,"\",4)+(Line.InventQty*Line.LineAmount)
 	Set ^KSTPR(AdminProductId,0,PeriodeSubscript) = ProductRec
 	
 	#dim ProductKlantLastInfoRec As %String = $Get(^KSTPR(AdminProductId,KlantNr,0),"")
@@ -82,17 +201,19 @@
 	
 	#dim ProductKlantRec As %String = $Get(^KSTPR(AdminProductId,KlantNr,PeriodeSubscript),"")
 	Set $Piece(ProductKlantRec,"\",1) = $Piece(ProductKlantRec,"\",1) + Line.InventQty
-	Set $Piece(ProductKlantRec,"\",2) = $Piece(ProductKlantRec,"\",1) + 1
+	Set $Piece(ProductKlantRec,"\",2) = $Piece(ProductKlantRec,"\",2) + 1
 	Set $Piece(ProductKlantRec,"\",3) = ..GeefMarge(Line)
-	Set $Piece(ProductKlantRec,"\",4) = $Piece(ProductKlantRec,"\",1) + (Line.InventQty*Line.LineAmount)
+	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>
 <Implementation><![CDATA[
+	/*
 	#dim WeekSubscript As %String = $$EXTDATE^vhLib.DataTypes(Line,"J4")_"."_$$EXTDATE^vhLib.DataTypes(Line,"W")_" "
 	#dim AdminProductId As %String = ..GetAdminProductId(Line)
 	
@@ -108,6 +229,7 @@
 	Set $Piece(WeekRec,"\",6) = StockNiveaus.Praktisch
 	
 	Set ^KSPW(AdminProductId,WeekSubscript )= WeekRec
+	*/
 ]]></Implementation>
 </Method>
 
@@ -119,21 +241,43 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefMarge">
-<FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line</FormalSpec>
+<Method name="GeefMargeVoorProduct">
+<FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line,ProductId:%Integer,AantalStuks:%Integer,Omzet:%Decimal</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Numeric</ReturnType>
-<Implementation><![CDATA[	Quit 100
+<Implementation><![CDATA[
+	;w !,"ProductId: '"_ProductId_"' * AantalStuks: '"_AantalStuks_"' * Omzet: '"_Omzet_"' * ItemId: '"_Line.ItemId_"' KlantId: '"_Line.InvoiceAccount_"'"
+	#dim KostPrijsPerStuk As %Decimal = ..ProductApi.GeefProduct(ProductId).GeefCifPPL()
+	
+	Quit (Omzet-(KostPrijsPerStuk*AantalStuks))
 ]]></Implementation>
 </Method>
 
 <Method name="GetAdminProductId">
 <FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line</FormalSpec>
 <Private>1</Private>
-<ReturnType>%String</ReturnType>
+<ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	Quit:$$$HasLength(Line.AdminProductNummer) Line.AdminProductNummer
-	Quit 1000 // Moet nog aangepast worden => AdminProductNummer is meestal leeg en soms zelfs NULL (dan ItemId gebruiken => converten naar ProductNr)
+	#dim ProductId As %Integer = 0
+	#dim ProductBestaat As %Boolean = $$$True
+	
+	If ((Line.AdminProductNummer = $Char(0)) || $$$Not($$$HasLength(Line.AdminProductNummer))) {
+		Set ProductBestaat = $$$False
+	} ElseIf ($$$Not(..ProductApi.BestaatProduct(Line.AdminProductNummer))) {
+		Set ProductBestaat = $$$False
+	}
+	
+	If ProductBestaat {
+		Set ProductId = Line.AdminProductNummer
+	} ElseIf (..ProductApi.BestaatIdentNr(Line.ItemId)) {
+		Set ProductId = ..ProductApi.GeefProductIdVoorIdentNummer(Line.ItemId) // I.g.v. Sopr voorlopig principaal gebruiken (= ItemId aangeleverd door AX)
+	}
+	
+	If ((ProductId = "2539") && (Line.InvoiceAccount = "01008")) {
+		w !,"Line.ItemId: '"_Line.ItemId_"'"
+	}
+	
+	Quit ProductId
 ]]></Implementation>
 </Method>
 
@@ -151,11 +295,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefDag1LopendeMaand">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Vandaag As %String = $Replace($$EXTDATE^vhLib.DataTypes(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog(),"DS"),"\","-")
+	Quit $Replace(Vandaag,$Piece(Vandaag,"-",3),"01")
+]]></Implementation>
+</Method>
+
 <Method name="IsNietMeeTeNemenKlant">
 <FormalSpec>KlantNr:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit +KlantNr="7587"
+<Implementation><![CDATA[	Quit +KlantNr="7587" ;Halux is intercompany en mag daarom niet meespelen
 ]]></Implementation>
 </Method>
 </Class>