Index: AX/Uitgaand/EC/DataAX/impl/AxFactuurLijnIterator.cls.xml
===================================================================
diff -u -r50282 -r50322
--- AX/Uitgaand/EC/DataAX/impl/AxFactuurLijnIterator.cls.xml	(.../AxFactuurLijnIterator.cls.xml)	(revision 50282)
+++ AX/Uitgaand/EC/DataAX/impl/AxFactuurLijnIterator.cls.xml	(.../AxFactuurLijnIterator.cls.xml)	(revision 50322)
@@ -21,67 +21,26 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..SqlQueryConnection = $$$Implementation(SqlQueryConnection,##class(AXimpl.SqlQueryConnection).%New())
+	Do ..VoerUitQuery()
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="InitRecente">
-<FormalSpec>CustomerID:%String,VanafDatum:%Date</FormalSpec>
-<Implementation><![CDATA[
-	#Dim SqlStatement as %String
-	Set SqlStatement = ..GeefSQLVoorFactuurHoofding()_" where INV.INVOICEACCOUNT='"_CustomerID_"' and INV.INVOICEDATE>'"_$ZD(VanafDatum,3)_"'" 
-	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
-]]></Implementation>
-</Method>
-
-<Method name="InitOpenstaande">
-<FormalSpec>CustomerID:%String</FormalSpec>
-<Implementation><![CDATA[
-	#Dim SqlStatement as %String
-	Set SqlStatement = ..GeefSQLVoorFactuurHoofding()_" where INV.INVOICEACCOUNT='"_CustomerID_"' and TRANS.CLOSED='1900-01-01' "
-	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
-]]></Implementation>
-</Method>
-
-<Method name="GeefSQLVoorFactuurHoofding">
+<Method name="VoerUitQuery">
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
+	
 	Set SqlStatement = ""
-	_"select INV.INVOICEID, INV.ORDERACCOUNT, INV.INVOICEACCOUNT, INV.INVOICEDATE, INV.DUEDATE, INVOICEAMOUNT,SUMTAX,INV.CURRENCYCODE,INV.CASHDISC, INV.CASHDISCDATE, "
-	_"     TRANS.CLOSED,TRANS.AMOUNTCUR,TRANS.SETTLEAMOUNTCUR"
-	_" from CUSTINVOICEJOUR as INV"
-	_" join salestable as ORD on ORD.salesid = INV.salesid "
-	_" join CUSTTRANS as TRANS on TRANS.INVOICE = INV.INVOICEID "
-	_"     and TRANS.ACCOUNTNUM = INV.INVOICEACCOUNT "
-	_"     and TRANS.TRANSDATE = INV.INVOICEDATE "
-	_"     and TRANS.VOUCHER = INV.LEDGERVOUCHER "
-	_"     and TRANS.DATAAREAID = INV.DATAAREAID "
-	Quit SqlStatement
-]]></Implementation>
-</Method>
+	_"select custinvoicetrans.* 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 LOGISTICSPOSTALADDRESS on LOGISTICSPOSTALADDRESS.RECID = CUSTINVOICEJOUR.INVOICEPOSTALADDRESS "
+	_" where exists (select * from CUSTTRANS where CUSTTRANS.INVOICE = CUSTINVOICEJOUR.INVOICEID and CUSTTRANS.ACCOUNTNUM = CUSTINVOICEJOUR.INVOICEACCOUNT and CUSTTRANS.TRANSDATE = CUSTINVOICEJOUR.INVOICEDATE "
+	_"               and CUSTTRANS.VOUCHER = CUSTINVOICEJOUR.LEDGERVOUCHER and CUSTTRANS.CLOSED = '1900-01-01' and  CUSTTRANS.DATAAREAID = CUSTINVOICEJOUR.DATAAREAID)"
 
-<Method name="InitDetail">
-<FormalSpec>FactuurID:%String</FormalSpec>
-<Implementation><![CDATA[
-	#Dim SqlStatement as %String
-	; toevoegen aan ADUECoResAttributeCombination where InvLine.ItemId = Kenmerk.ItemId AND
-	Set SqlStatement = ""
-	_"select INVOICEID,InvLine.LINENUM,ORD.SALESID,ORD.PURCHORDERFORMNUM,ORD.CUSTOMERREF,ORD.CREATEDDATETIME,InvLine.ITEMID,ADMINPRODUCTNUMMER,DLVDATE,MCRDLVMODE,"
-	_"     InvLine.QTY,InvLine.SALESPRICE,InvLine.PRICEUNIT,InvLine.CURRENCYCODE,InvLine.LINEAMOUNT, SalesLine.RECEIPTDATECONFIRMED,SalesLine.RECEIPTDATEREQUESTED,ProdNotes.Body as PRODREF,"
-	_"     ADR.RECID,ADR.COUNTRYREGIONID,ADR.CITY,ADR.ZIPCODE,ADR.STREET,ADR.ADUNOTA1EXTERNAL,ADR.ADUNOTA2EXTERNAL,ADR.ADUTRANSPORTERAUTH" 
-	_" from CUSTINVOICETRANS as InvLine"
-	_" join SalesLine on SalesLine.InventTransId = InvLine.InventTransId and SalesLine.DataAreaId=InvLine.DataAreaId "
-	_" join SalesTable ORD on ORD.SalesId = SalesLine.SALESID"
-	_" left outer join LOGISTICSPOSTALADDRESS as ADR on ADR.RECID =Salesline.DELIVERYPOSTALADDRESS "
-    _" join InventDim  on InventDim.InventDimId = InvLine.InventDimId "
-	_"      and InventDim.DataAreaId = InvLine.DataAreaId "
-	_" left outer join ADUEcoResAttributeCombination as Kenmerk on InventDim.ConfigId=Kenmerk.ConfigId "
-    _"   and SalesLine.ITEMID=Kenmerk.ITEMID "
-    _"   and InventDim.ConfigId<>'' "
-	_" left outer join AduCustomerFormNotes as ProdNotes on ProdNotes.REFTABLEID=359 and ProdNotes.REFRECID=SalesLine.RECID and ADUBODYTYPE=5"
-	_" where InvLine.DataAreaID='vhbe' and InvLine.INVOICEID = '"_FactuurID_"' " ; specifieke factuur
+	
 	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
 ]]></Implementation>
 </Method>