Index: AXimpl/Admin/STAT/Invoice/Processor.cls.xml
===================================================================
diff -u -r49548 -r49549
--- AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49548)
+++ AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 49549)
@@ -3,6 +3,11 @@
 <Class name="AXimpl.Admin.STAT.Invoice.Processor">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="StatistiekMaand">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="InvoiceLineIterator">
 <Type>AXimpl.Admin.STAT.Invoice.LineIterator</Type>
 <Private>1</Private>
@@ -25,18 +30,19 @@
 
 <UDLText name="T">
 <Content><![CDATA[
-// 	Do ##class(AXimpl.Admin.STAT.Invoice.Processor).%New().Process()
+// 	Do ##class(AXimpl.Admin.STAT.Invoice.Processor).%New(+$H).Process()
 
 ]]></Content>
 </UDLText>
 
 <Method name="%OnNew">
-<FormalSpec>InvoiceLineIterator:AXimpl.Admin.STAT.Invoice.LineIterator,Logger:vhLib.Logger,ProductApi:DOM.PM.ProductAPI,DateTimeApi:TECH.DateTime.DateTimeAPI</FormalSpec>
+<FormalSpec>StatistiekMaand:%Date,InvoiceLineIterator:AXimpl.Admin.STAT.Invoice.LineIterator,Logger:vhLib.Logger,ProductApi:DOM.PM.ProductAPI,DateTimeApi:TECH.DateTime.DateTimeAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..StatistiekMaand=StatistiekMaand
 	#dim LastProcessedRecId As %Integer = ..GetLastProcessedRecord()
 	#dim InvoiceDate As %String = ..GeefDag1LopendeMaand()
 	Set ..InvoiceLineIterator = $$$Inject(InvoiceLineIterator, ##class(AXimpl.Admin.STAT.Invoice.LineIterator).%New(,InvoiceDate))
@@ -86,7 +92,6 @@
 			}
 			// SETTERS
 			Do ..ProcessKlantLastInfoRec(Line, KlantNr)
-			Do ..ProcessKlantMaandRec(Line, KlantNr, Maand)
 			If $$$Not(ProductBestaatNiet) {
 				Do ..ProcessKlantProductLastInfoRec(Line, KlantNr, ProductId) // Ook ProductKlantLastInfoRec
 				Do ..ProcessKlantProductMaandRec(Line, KlantNr, ProductId, Maand) // Ook ProductMaandRec EN ProductKlantMaandRec
@@ -97,7 +102,6 @@
 			Set VorigProductId = ProductId
 		}
 	}
-	;Do ..ProcessKSPW(Line) // Deze een eigen query geven die optelling doet en pas nadien uitvoeren, als andere 2 statistieken klaar zijn
 ]]></Implementation>
 </Method>
 
@@ -173,26 +177,13 @@
 ]]></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() // Als laatste via $Order te verkrijgen
-	Set ^KSTKL(KlantNr,0,Maand) = KlantMaandRec
-]]></Implementation>
-</Method>
-
 <Method name="ProcessKlantProductLastInfoRec">
 <FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line,KlantNr:%Integer,ProductId:%Integer</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim ConvertedInvoiceDateLine As %String = ..DateTimeApi.GeefDatumInPuntNotatie(..DateTimeApi.TextToDate($Piece(Line.InvoiceDate," ",1)))
 	#dim DatumLine As %Date = ##class(TECH.DateTime).TextToDate(ConvertedInvoiceDateLine)
-	#dim VerkoopEenheid As %String = ..GeefVerkoopEenheid(Line)
+	#dim VerkoopEenheid As %String = ..GeefVerkoopEenheid(Line.PriceUnit)
 	
 	#dim BestaatKlantProductLastInfoRec As %Boolean = $Data(^KSTKL(KlantNr,ProductId,0))
 	#dim KlantProductLastInfoRec As %String = $Get(^KSTKL(KlantNr,ProductId,0),"")
@@ -201,7 +192,7 @@
 		Set $Piece(KlantProductLastInfoRec,"\",2) = Line.LineAmount
 		Set $Piece(KlantProductLastInfoRec,"\",3) = VerkoopEenheid
 		Set $Piece(KlantProductLastInfoRec,"\",4) = "EUR"
-		;Set $Piece(KlantProductLastInfoRec,"\",5) = 1
+		Set $Piece(KlantProductLastInfoRec,"\",5) = 1
 		Set ^KSTKL(KlantNr,ProductId,0) = KlantProductLastInfoRec
 	} Else {
 		#dim DatumKlantProductLastInfoRec As %Date = ##class(TECH.DateTime).TextToDate($Piece(KlantProductLastInfoRec,"\",1))
@@ -213,7 +204,7 @@
 			Set $Piece(KlantProductLastInfoRec,"\",2) = Line.LineAmount
 			Set $Piece(KlantProductLastInfoRec,"\",3) = VerkoopEenheid
 			Set $Piece(KlantProductLastInfoRec,"\",4) = "EUR"
-			;Set $Piece(KlantProductLastInfoRec,"\",5) = 1
+			Set $Piece(KlantProductLastInfoRec,"\",5) = 1
 			Set ^KSTKL(KlantNr,ProductId,0) = KlantProductLastInfoRec
 		}
 	}
@@ -225,7 +216,7 @@
 		Set $Piece(ProductKlantLastInfoRec,"\",2) = Line.LineAmount
 		Set $Piece(ProductKlantLastInfoRec,"\",3) = VerkoopEenheid
 		Set $Piece(ProductKlantLastInfoRec,"\",4) = "EUR"
-		;Set $Piece(ProductKlantLastInfoRec,"\",5) = 1
+		Set $Piece(ProductKlantLastInfoRec,"\",5) = 1
 		Set ^KSTPR(ProductId,KlantNr,0) = ProductKlantLastInfoRec
 	} Else {
 		#dim DatumProductKlantLastInfoRec As %Date = ##class(TECH.DateTime).TextToDate($Piece(ProductKlantLastInfoRec,"\",1))
@@ -237,7 +228,7 @@
 			Set $Piece(ProductKlantLastInfoRec,"\",2) = Line.LineAmount
 			Set $Piece(ProductKlantLastInfoRec,"\",3) = VerkoopEenheid
 			Set $Piece(ProductKlantLastInfoRec,"\",4) = "EUR"
-			;Set $Piece(ProductKlantLastInfoRec,"\",5) = 1
+			Set $Piece(ProductKlantLastInfoRec,"\",5) = 1
 			Set ^KSTPR(ProductId,KlantNr,0) = ProductKlantLastInfoRec
 		}
 	}
@@ -248,57 +239,43 @@
 <FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line,KlantNr:%Integer,ProductId:%Integer,Maand:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	#dim Marge as %Decimal = ..GeefMargeVoorProduct(Line,ProductId,Line.InventQty,Line.LineAmount)
 	#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 $Piece(KlantProductMaandRec,"\",4) = $Piece(KlantProductMaandRec,"\",4)+Marge
 	Set ^KSTKL(KlantNr,ProductId,Maand) = KlantProductMaandRec
 	
 	#dim ProductKlantMaandRec As %String = $Get(^KSTPR(ProductId,KlantNr,Maand),"")
 	Set $Piece(ProductKlantMaandRec,"\",1) = $Piece(ProductKlantMaandRec,"\",1) + Line.InventQty
 	Set $Piece(ProductKlantMaandRec,"\",2) = $Piece(ProductKlantMaandRec,"\",2) + 1
 	Set $Piece(ProductKlantMaandRec,"\",3) = $Piece(ProductKlantMaandRec,"\",3) + Line.LineAmount
-	Set $Piece(ProductKlantMaandRec,"\",4) = ..GeefMargeVoorProduct(Line,ProductId,$Piece(ProductKlantMaandRec,"\",1),$Piece(ProductKlantMaandRec,"\",3))
+	Set $Piece(ProductKlantMaandRec,"\",4) = $Piece(ProductKlantMaandRec,"\",4)+Marge
 	Set ^KSTPR(ProductId,KlantNr,Maand) = ProductKlantMaandRec
 	
 	#dim ProductMaandRec As %String = $Get(^KSTPR(ProductId,0,Maand),"")
 	Set $Piece(ProductMaandRec,"\",1) = $Piece(ProductMaandRec,"\",1) + Line.InventQty
 	Set $Piece(ProductMaandRec,"\",2) = $Piece(ProductMaandRec,"\",2) + 1
 	Set $Piece(ProductMaandRec,"\",3) = $Piece(ProductMaandRec,"\",3) + Line.LineAmount
-	;Set $Piece(ProductMaandRec,"\",4) = ..GeefMarge() // Als laatste via $Order te verkrijgen
+	Set $Piece(ProductMaandRec,"\",4) = $Piece(ProductMaandRec,"\",4)+Marge
 	Set ^KSTPR(ProductId,0,Maand) = ProductMaandRec
-]]></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)
-	#dim StockNiveaus As APPS.common.dto.StockNiveaus = ##class(APPS.common.StockNiveauService).%New(AdminProductId).GeefAlleStockTypeNiveaus()
-	#dim WeekRec As %String = $Get(^KSPW(AdminProductId,WeekSubscript))
 	
-	Set $Piece(WeekRec,"\",1) = $Piece(WeekRec,"\",1) + Line.InventQty
-	Set $Piece(WeekRec,"\",2) = $Piece(WeekRec,"\",2) + Line.LineAmount
-	Set $Piece(WeekRec,"\",3) = ..GeefMarge(Line)
-	Set $Piece(WeekRec,"\",4) = StockNiveaus.Fysisch
-	Set $Piece(WeekRec,"\",5) = StockNiveaus.Theoretisch
-	Set $Piece(WeekRec,"\",6) = StockNiveaus.Praktisch
-	
-	Set ^KSPW(AdminProductId,WeekSubscript )= WeekRec
-	*/
+	#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) = $Piece(KlantMaandRec,"\",4)+Marge
+	Set ^KSTKL(KlantNr,0,Maand) = KlantMaandRec
 ]]></Implementation>
 </Method>
 
 <Method name="GeefVerkoopEenheid">
-<FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line</FormalSpec>
+<FormalSpec>PriceUnit:%Integer</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Quit:Line.PriceUnit="100" "H1"
+	Quit:+PriceUnit=100 "H1"
 	Quit "E1"
 ]]></Implementation>
 </Method>
@@ -356,8 +333,8 @@
 <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")
+	#dim StatistiekDatum As %String = $Replace($$EXTDATE^vhLib.DataTypes(..StatistiekMaand,"DS"),"\","-")
+	Quit $Replace(StatistiekDatum,$Piece(StatistiekDatum,"-",3),"01")
 ]]></Implementation>
 </Method>
 
@@ -374,7 +351,7 @@
 <FormalSpec>KlantNr:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit +KlantNr="7587" ;Halux is intercompany en mag daarom niet meespelen
+<Implementation><![CDATA[	Quit +KlantNr="7587" // Halux is intercompany en mag daarom niet meespelen
 ]]></Implementation>
 </Method>
 </Class>