Index: AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml
===================================================================
diff -u -r49655 -r49681
--- AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml	(.../LineIterator.cls.xml)	(revision 49655)
+++ AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml	(.../LineIterator.cls.xml)	(revision 49681)
@@ -18,21 +18,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="FirstDate">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="LastDate">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="InvoiceDate">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
 <FormalSpec>SqlQueryConnection:AXimpl.SqlQueryConnection,InvoiceDate:%String="2018-01-01"</FormalSpec>
 <Private>1</Private>
@@ -42,16 +27,17 @@
 <Implementation><![CDATA[
 	Set ..SqlQueryConnection = $$$Implementation(SqlQueryConnection,##class(AXimpl.SqlQueryConnection).%New())
 	#dim TimeUtils as TECH.DateTime.impl.DateTimeAPI=##class(TECH.DateTime.impl.DateTimeAPI).%New()
-	Set ..FirstDate = TimeUtils.HorologToTimeStamp(TimeUtils.EersteDagVanMaand(TimeUtils.TimeStampToHorolog(InvoiceDate)))
-	Set ..LastDate = TimeUtils.HorologToTimeStamp(TimeUtils.LaatsteDagVanMaand(TimeUtils.TimeStampToHorolog(InvoiceDate)))
-	Do ..VoerUitQuery()
+	#dim FirstDate As %String = TimeUtils.HorologToTimeStamp(TimeUtils.EersteDagVanMaand(TimeUtils.TimeStampToHorolog(InvoiceDate)))
+	#dim LastDate As %String = TimeUtils.HorologToTimeStamp(TimeUtils.LaatsteDagVanMaand(TimeUtils.TimeStampToHorolog(InvoiceDate)))
+	Do ..VoerUitQuery(FirstDate, LastDate)
 	Set ..ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="VoerUitQuery">
+<FormalSpec>FirstDate:%String,LastDate:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim SqlStatement As %String = ""
@@ -64,7 +50,7 @@
 		_" 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  AND InventDim.ConfigId <> ''"
-		_" WHERE CustInvoiceTrans.InvoiceDate >= '"_..FirstDate_"' AND CustInvoiceTrans.InvoiceDate <= '"_..LastDate_"' AND CustInvoiceTrans.ItemId <> ''"
+		_" WHERE CustInvoiceTrans.InvoiceDate >= '"_FirstDate_"' AND CustInvoiceTrans.InvoiceDate <= '"_LastDate_"' AND CustInvoiceTrans.ItemId <> ''"
 		_" ORDER BY CustInvoiceJour.InvoiceAccount, CustInvoiceTrans.ItemId"
 	
 	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)