Index: AX/Uitgaand/EC/DataAX/impl/AxOrderLijnIterator.cls.xml
===================================================================
diff -u -r48574 -r50282
--- AX/Uitgaand/EC/DataAX/impl/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 48574)
+++ AX/Uitgaand/EC/DataAX/impl/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 50282)
@@ -3,11 +3,6 @@
 <Class name="AX.Uitgaand.EC.DataAX.impl.AxOrderLijnIterator">
 <Super>TECH.RegisteredObject,TECH.Iterator</Super>
 
-<Property name="Converter">
-<Type>AXimpl.Controle.Order.Ax.AxOrderLijnConverter</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="ResultSet">
 <Type>TECH.ResultSet</Type>
 <Private>1</Private>
@@ -19,68 +14,66 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>SqlQueryConnection:AXimpl.SqlQueryConnection,RecenteDatum:%Date=""</FormalSpec>
+<FormalSpec>SqlQueryConnection:AXimpl.SqlQueryConnection</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..SqlQueryConnection = $$$Implementation(SqlQueryConnection,##class(AXimpl.SqlQueryConnection).%New())
-	If RecenteDatum
-	{
-		Do ..VoerUitQueryRecente(RecenteDatum)
-	}
-	Else
-	{
-		Do ..VoerUitQueryOpenstaande()
-	}
-	Set ..Converter = ##class(AXimpl.Controle.Order.Ax.AxOrderLijnConverter).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="VoerUitQueryOpenstaande">
-<FormalSpec>RecenteDatum:%Date</FormalSpec>
-<Private>1</Private>
+<Method name="InitRecente">
+<FormalSpec>CustomerID:%String,VanafDatum:%Date</FormalSpec>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	
-	Set SqlStatement = ""
-	_"select * from SALESTABLE left outer join SALESLINE on SALESLINE.SALESID = SALESTABLE.SALESID"
-	_" where SALESLINE.DATAAREAID = SALESTABLE.DATAAREAID "
-	_" and SALESTABLE.SALESSTATUS <> 4"
-	_" and SALESLINE.SALESSTATUS <> 4"
-	_" and SALESTABLE.SALESTYPE = 3"
-	
-	;SalesStatus order header values: Open order = 1, Delivered = 2, Invoiced = 3, Canceled = 4
-	;SalesStatus order lines  values: Open order = 1, Delivered = 2, Invoiced = 3, Canceled = 4 
-	;SalesType values: Journal = 0, Sales (order) = 3, Return order = 4 
-	
+	Set SqlStatement = ..GeefSQLVoorOrderLijnen()_" AND ORD.CUSTACCOUNT='"_CustomerID_"' and ORD.CREATEDDATETIME>='"_$ZD(VanafDatum,3)_"' and SalesLine.SALESSTATUS<>4" 
 	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
 ]]></Implementation>
 </Method>
 
-<Method name="VoerUitQueryRecente">
-<FormalSpec>RecenteDatum:%Date</FormalSpec>
+<Method name="InitOpenstaande">
+<FormalSpec>CustomerID:%String</FormalSpec>
+<Implementation><![CDATA[
+	#Dim SqlStatement as %String
+	Set SqlStatement = ..GeefSQLVoorOrderLijnen()_" AND ORD.CUSTACCOUNT='"_CustomerID_"' and SalesLine.SALESSTATUS = 1"
+	; SalesStatus order lines  values: Open order = 1, Delivered = 2, Invoiced = 3, Canceled = 4 
+
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+]]></Implementation>
+</Method>
+
+<Method name="GeefSQLVoorOrderLijnen">
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	
 	Set SqlStatement = ""
-	_"select * from SALESTABLE left outer join SALESLINE on SALESLINE.SALESID = SALESTABLE.SALESID"
-	_" where SALESLINE.DATAAREAID = SALESTABLE.DATAAREAID "
-	_" and SALESTABLE.SALESSTATUS = 1"
-	_" and SALESLINE.SALESSTATUS = 1"
-	_" and SALESTABLE.SALESTYPE = 3"
-	_" and SALESTABLE.CREATEDDATETIME >= '"_$zd(RecenteDatum) _ " 20171201 00:00:00.000' "
+	_"select ORD.SALESID,ORD.PURCHORDERFORMNUM,ORD.CUSTOMERREF,ORD.CREATEDDATETIME, OrdNotes.Body as ORDERCONFTXT, SalesLine.EXTERNALITEMID,"
+	_"   SalesLine.EXTERNALITEMID, SalesLine.CustomerLineNum,SalesLine.ADUORDERSTATUSID,SalesLine.ADUEXPLODEINVENTTRANSID,SalesLine.CREATEDBY,SALESORIGINID,"
+    _"   SalesLine.SALESSTATUS,SalesLine.ITEMID,ADMINPRODUCTNUMMER,QTYORDERED,REMAINSALESPHYSICAL,SalesLine.RECEIPTDATECONFIRMED,SalesLine.RECEIPTDATEREQUESTED,"
+    _"   SalesLine.SALESPRICE,SalesLine.PRICEUNIT,SalesLine.LINEAMOUNT,SalesLine.CURRENCYCODE,ProdNotes.Body as PRODREF,LijnNotes.Body as LIJNCONFTXT,SalesLine.DLVMODE, "
+    _"   ADR.RECID,ADR.COUNTRYREGIONID,ADR.CITY,ADR.ZIPCODE,ADR.STREET,ADR.ADUNOTA1EXTERNAL,ADR.ADUNOTA2EXTERNAL,ADR.ADUTRANSPORTERAUTH" 
+    _"   ,isnull(( select -sum(qty) from InventTrans where InventTransOrigin.RECID = InventTrans.INVENTTRANSORIGIN and InventTrans.STATUSISSUE = 3 and "
+	_"            InventTrans.STATUSRECEIPT = 0 and InventTrans.DATAAREAID = InventTransOrigin.DATAAREAID and InventTrans.PARTITION = InventTransOrigin.PARTITION),0) as GEPICKTEHOEVEELHEID"
+	_" from SalesLine "
+	_" join SalesTable as ORD on SalesLine.SALESID = ORD.SALESID and SalesLine.DATAAREAID = ORD.DATAAREAID"
+	_" join InventTransOrigin on InventTransOrigin.INVENTTRANSID = SalesLine.INVENTTRANSID and InventTransOrigin.DATAAREAID = SalesLine.DATAAREAID and "
+	_"                           InventTransOrigin.PARTITION = SalesLine.PARTITION "
+	_" left outer join LOGISTICSPOSTALADDRESS as ADR on ADR.RECID =Salesline.DELIVERYPOSTALADDRESS "
+	_" join InventDim  on InventDim.InventDimId =SalesLine.InventDimId "
+	_"   and InventDim.DataAreaId = SalesLine.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 ProdNotes.ADUBODYTYPE=5"
+	_" left outer join AduCustomerFormNotes as LijnNotes on LijnNotes.REFTABLEID=359 and LijnNotes.REFRECID=SalesLine.RECID and LijnNotes.ADUBODYTYPE=1"
+	_" left outer join AduCustomerFormNotes as OrdNotes on OrdNotes.REFTABLEID=366 and OrdNotes.REFRECID=ORD.RECID and OrdNotes.ADUBODYTYPE=1"
+	_" where ORD.SALESTYPE = 3 " ; SalesType values: Journal = 0, Sales (order) = 3, Return order = 4 "
 
-	
-	;SalesStatus order header values: Open order = 1, Delivered = 2, Invoiced = 3, Canceled = 4
-	;SalesStatus order lines  values: Open order = 1, Delivered = 2, Invoiced = 3, Canceled = 4 
-	;SalesType values: Journal = 0, Sales (order) = 3, Return order = 4 
-	
-	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+	Quit SqlStatement
 ]]></Implementation>
 </Method>