Index: AXimpl/Admin/STAT/Invoice/Line.cls.xml
===================================================================
diff -u -r49659 -r53686
--- AXimpl/Admin/STAT/Invoice/Line.cls.xml	(.../Line.cls.xml)	(revision 49659)
+++ AXimpl/Admin/STAT/Invoice/Line.cls.xml	(.../Line.cls.xml)	(revision 53686)
@@ -35,6 +35,10 @@
 <Type>%Numeric</Type>
 </Property>
 
+<Property name="LineCost">
+<Type>%Numeric</Type>
+</Property>
+
 <Property name="SalesPrice">
 <Type>%Numeric</Type>
 </Property>
Index: AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml
===================================================================
diff -u -r51463 -r53686
--- AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml	(.../LineIterator.cls.xml)	(revision 51463)
+++ AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml	(.../LineIterator.cls.xml)	(revision 53686)
@@ -43,9 +43,15 @@
 	#dim SqlStatement As %String = ""
 	Set SqlStatement = 
 		"SELECT CustInvoiceJour.InvoiceAccount,CustInvoiceJour.OrderAccount,CustInvoiceJour.InvoiceId,CustInvoiceTrans.ItemId,com.AdminProductNummer,"
-		_" CustInvoiceTrans.InventQty,CustInvoiceTrans.LineAmount,CustInvoiceTrans.TaxAmount, CustInvoiceJour.InvoiceDate, CustInvoiceJour.RecId,"
-		_" CustInvoiceTrans.CurrencyCode, CustInvoiceTrans.PriceUnit,CustInvoiceTrans.SalesPrice"
+		_" CustInvoiceTrans.InventQty,CustInvoiceTrans.LineAmount,CustInvoiceTrans.TaxAmount, ISNULL(it.COSTAMOUNTOPERATIONS,0) LineCost, CustInvoiceJour.InvoiceDate,"
+		_" CustInvoiceJour.RecId, CustInvoiceTrans.CurrencyCode, CustInvoiceTrans.PriceUnit,CustInvoiceTrans.SalesPrice"
 		_" FROM CustInvoiceTrans"
+		_" LEFT OUTER JOIN INVENTTRANSORIGIN ito ON CustInvoiceTrans.inventTransId = ito.INVENTTRANSID AND ito.DATAAREAID = CustInvoiceTrans.DATAAREAID"
+		_" AND CustInvoiceTrans.PARTITION = ito.PARTITION"
+		_" LEFT OUTER JOIN"
+		_" (SELECT SUM(Qty) Qty, SUM(REVENUEAMOUNTPHYSICAL) REVENUEAMOUNTPHYSICAL, SUM(COSTAMOUNTOPERATIONS) COSTAMOUNTOPERATIONS, dataareaid, partition, inventtransorigin, invoiceid"
+		_" FROM inventtrans it1 GROUP BY dataareaid, inventtransorigin, invoiceid, PARTITION) it ON it.INVENTTRANSORIGIN = ito.recid AND it.DATAAREAID = ito.DATAAREAID"
+		_" AND it.INVOICEID = CustInvoiceTrans.INVOICEID AND it.PARTITION = CustInvoiceTrans.PARTITION"
 		_" JOIN InventDim ON InventDim.InventDimId = CustInvoiceTrans.InventDimId AND InventDim.DataAreaId = CustInvoiceTrans.DataAreaId"
 		_" JOIN CustInvoiceJour ON CustInvoiceJour.InvoiceId = CustInvoiceTrans.InvoiceId AND CustInvoiceJour.InvoiceDate = CustInvoiceTrans.InvoiceDate"
 		_" AND CustInvoiceJour.DataAreaId = CustInvoiceTrans.DataAreaId"
@@ -77,6 +83,7 @@
 	Set InvoiceLine.InventQty = ResultSet.GetDataByName("InventQty")
 	Set InvoiceLine.LineAmount = ResultSet.GetDataByName("LineAmount")
 	Set InvoiceLine.TaxAmount = ResultSet.GetDataByName("TaxAmount")
+	Set InvoiceLine.LineCost = ResultSet.GetDataByName("LineCost")
 	Set InvoiceLine.InvoiceDate = ResultSet.GetDataByName("InvoiceDate")
 	Set InvoiceLine.RecId = ResultSet.GetDataByName("RecId")
 	Set InvoiceLine.Currency = ResultSet.GetDataByName("CurrencyCode")
Index: AXimpl/Admin/STAT/Invoice/Processor.cls.xml
===================================================================
diff -u -r51819 -r53686
--- AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 51819)
+++ AXimpl/Admin/STAT/Invoice/Processor.cls.xml	(.../Processor.cls.xml)	(revision 53686)
@@ -218,7 +218,7 @@
 <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 Marge as %Decimal = Line.LineAmount - Line.LineCost
 	#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
@@ -259,26 +259,6 @@
 ]]></Implementation>
 </Method>
 
-<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[
-	#dim KostPrijsPerStuk As %Decimal
-	#dim Product as DOM.PM.Product =..ProductApi.GeefProduct(ProductId)
-	If (Product.GeefGenerischProductID()="") || (Product.GeefGenerischProductID()?4.10N) {
-		Set KostPrijsPerStuk = Product.GeefCifPPL()
-	} Else {
-		If AantalStuks'=0 {
-			Set KostPrijsPerStuk=Omzet*.7/AantalStuks ; best guess als er een generisch product wordt doorgekreven van AX ipv een afgeleid product
-		} Else {
-			Set KostPrijsPerStuk=0
-		}
-	}
-	Quit (Omzet-(KostPrijsPerStuk*AantalStuks))
-]]></Implementation>
-</Method>
-
 <Method name="GetAdminProductId">
 <FormalSpec>Line:AXimpl.Admin.STAT.Invoice.Line</FormalSpec>
 <Private>1</Private>