Index: AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml
===================================================================
diff -u -r49472 -r49523
--- AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml	(.../LineIterator.cls.xml)	(revision 49472)
+++ AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml	(.../LineIterator.cls.xml)	(revision 49523)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ResultSetIterator">
+<Type>TECH.ResultSetIterator</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="SqlQueryConnection">
 <Type>AXimpl.SqlQueryConnection</Type>
 <Private>1</Private>
@@ -18,22 +23,17 @@
 <Private>1</Private>
 </Property>
 
-<Property name="LastProcessedRecId">
-<Type>%Integer</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>SqlQueryConnection:AXimpl.SqlQueryConnection,InvoiceDate:%String,LastProcessedRecId:%Integer</FormalSpec>
+<FormalSpec>SqlQueryConnection:AXimpl.SqlQueryConnection,InvoiceDate:%String="2018-01-01"</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()
+	Set ..ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -44,39 +44,41 @@
 <Implementation><![CDATA[
 	#dim SqlStatement As %String = ""
 	Set SqlStatement = 
-		"SELECT DISTINCT CustInvoiceJour.OrderAccount,CustInvoiceTrans.ItemId,CustInvoiceJour.InvoiceDate FROM CustInvoiceTrans"
+		"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 CustInvoiceTrans.InvoiceDate > '"_..InvoiceDate_"' AND CustInvoiceJour.RecId > "_..LastProcessedRecId
-		_" ORDER BY CustInvoiceJour.OrderAccount, CustInvoiceTrans.ItemId, CustInvoiceJour.InvoiceDate"
+		_" LEFT OUTER JOIN AduEcoresAttributeCombinatiON COM ON com.ItemId = CustInvoiceTrans.ItemId AND com.ConfigId = InventDim.ConfigId  AND InventDim.ConfigId <> ''"
+		_" WHERE CustInvoiceTrans.InvoiceDate >= '"_..InvoiceDate_"' AND CustInvoiceTrans.ItemId <> ''"
+		_" ORDER BY CustInvoiceJour.InvoiceAccount, CustInvoiceTrans.ItemId"
+	
 	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
 ]]></Implementation>
 </Method>
 
 <Method name="HasNext">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (..ResultSet.Next() > 0)
+<Implementation><![CDATA[	Quit ..ResultSetIterator.HasNext()
 ]]></Implementation>
 </Method>
 
 <Method name="Next">
 <ReturnType>AXimpl.Admin.STAT.Invoice.Line</ReturnType>
 <Implementation><![CDATA[
+	#dim ResultSet As TECH.ResultSet = ..ResultSetIterator.Next()
 	Set InvoiceLine = ##class(AXimpl.Admin.STAT.Invoice.Line).%New()
-	Set InvoiceLine.OrderAccount = ..ResultSet.GetDataByName("OrderAccount")
-	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.RecId = ..ResultSet.GetDataByName("RecId")
-	*/
+	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.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>