Index: AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml
===================================================================
diff -u -r49447 -r49472
--- AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml	(.../LineIterator.cls.xml)	(revision 49447)
+++ AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml	(.../LineIterator.cls.xml)	(revision 49472)
@@ -13,19 +13,25 @@
 <Private>1</Private>
 </Property>
 
+<Property name="InvoiceDate">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="LastProcessedRecId">
 <Type>%Integer</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>SqlQueryConnection:AXimpl.SqlQueryConnection,LastProcessedRecId:%Integer</FormalSpec>
+<FormalSpec>SqlQueryConnection:AXimpl.SqlQueryConnection,InvoiceDate:%String,LastProcessedRecId:%Integer</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..SqlQueryConnection = $$$Implementation(SqlQueryConnection,##class(AXimpl.SqlQueryConnection).%New())
+	Set ..InvoiceDate = InvoiceDate
 	set ..LastProcessedRecId = LastProcessedRecId
 	Do ..VoerUitQuery()
 	
@@ -38,15 +44,13 @@
 <Implementation><![CDATA[
 	#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"
-		_ " FROM CustInvoiceTrans"
-		_ " 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"
-		_ " LEFT OUTER JOIN AduEcoresAttributeCombinatiON COM ON com.ItemId = CustInvoiceTrans.ItemId AND com.ConfigId = InventDim.ConfigId"
-		_ " WHERE CustInvoiceJour.RecId > "_..LastProcessedRecId
-		_ " AND CustInvoiceTrans.InvoiceDate > '2018-01-01'"
-	
+		"SELECT DISTINCT CustInvoiceJour.OrderAccount,CustInvoiceTrans.ItemId,CustInvoiceJour.InvoiceDate FROM CustInvoiceTrans"
+		_" 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"
+		_" LEFT OUTER JOIN AduEcoresAttributeCombinatiON COM ON com.ItemId = CustInvoiceTrans.ItemId AND com.ConfigId = InventDim.ConfigId"
+		_" WHERE CustInvoiceTrans.InvoiceDate > '"_..InvoiceDate_"' AND CustInvoiceJour.RecId > "_..LastProcessedRecId
+		_" ORDER BY CustInvoiceJour.OrderAccount, CustInvoiceTrans.ItemId, CustInvoiceJour.InvoiceDate"
 	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
 ]]></Implementation>
 </Method>
@@ -61,16 +65,18 @@
 <ReturnType>AXimpl.Admin.STAT.Invoice.Line</ReturnType>
 <Implementation><![CDATA[
 	Set InvoiceLine = ##class(AXimpl.Admin.STAT.Invoice.Line).%New()
-	Set InvoiceLine.InvoiceAccount = ..ResultSet.GetDataByName("InvoiceAccount")
 	Set InvoiceLine.OrderAccount = ..ResultSet.GetDataByName("OrderAccount")
-	Set InvoiceLine.InvoiceId = ..ResultSet.GetDataByName("InvoiceId")
 	Set InvoiceLine.ItemId = ..ResultSet.GetDataByName("ItemId")
+	Set InvoiceLine.InvoiceDate = ..ResultSet.GetDataByName("InvoiceDate")
+	/*
+	Set InvoiceLine.InvoiceAccount = ..ResultSet.GetDataByName("InvoiceAccount")
+	Set InvoiceLine.InvoiceId = ..ResultSet.GetDataByName("InvoiceId")
 	Set InvoiceLine.AdminProductNummer = ..ResultSet.GetDataByName("AdminProductNummer")
 	Set InvoiceLine.InventQty = ..ResultSet.GetDataByName("InventQty")
 	Set InvoiceLine.LineAmount = ..ResultSet.GetDataByName("LineAmount")
 	Set InvoiceLine.TaxAmount = ..ResultSet.GetDataByName("TaxAmount")
-	Set InvoiceLine.InvoiceDate = ..ResultSet.GetDataByName("InvoiceDate")
 	Set InvoiceLine.RecId = ..ResultSet.GetDataByName("RecId")
+	*/
 	Quit InvoiceLine
 ]]></Implementation>
 </Method>