Index: AX/Uitgaand/EC/DataAX/impl/AxOrderLijnIterator.cls.xml
===================================================================
diff -u -r50353 -r53242
--- AX/Uitgaand/EC/DataAX/impl/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 50353)
+++ AX/Uitgaand/EC/DataAX/impl/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 53242)
@@ -31,18 +31,20 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = ..GeefSQLVoorOrderLijnen()_" AND ORD.CUSTACCOUNT='"_CustomerID_"' and ORD.CREATEDDATETIME>='"_$ZD(VanafDatum,3)_"' and SalesLine.SALESSTATUS<>4" 
-	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSetWithoutExecute(SqlStatement)
+	Set sc=..ResultSet.Execute()
 ]]></Implementation>
 </Method>
 
 <Method name="InitOpenstaande">
 <FormalSpec>CustomerID:%String</FormalSpec>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set SqlStatement = ..GeefSQLVoorOrderLijnen()_" AND ORD.CUSTACCOUNT='"_CustomerID_"' and SalesLine.SALESSTATUS = 1"
+	Set SqlStatement = ..GeefSQLVoorOrderLijnen()_" AND SalesLine.SALESSTATUS = 1 AND ORD.CUSTACCOUNT='"_CustomerID_"'"
 	; SalesStatus order lines  values: Open order = 1, Delivered = 2, Invoiced = 3, Canceled = 4 
 
-	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSetWithoutExecute(SqlStatement)
+	Set sc=..ResultSet.Execute()
 ]]></Implementation>
 </Method>
 
@@ -59,19 +61,21 @@
     _"   ,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 SalesTable as ORD on SalesLine.SALESID = ORD.SALESID and SalesLine.DATAAREAID = ORD.DATAAREAID and SalesLine.PARTITION = ORD.PARTITION "
 	_" 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 "
+	_" left outer join LOGISTICSPOSTALADDRESS as ADR on ADR.RECID =Salesline.DELIVERYPOSTALADDRESS and ADR.PARTITION=SalesLine.PARTITION"
 	_" join InventDim  on InventDim.InventDimId =SalesLine.InventDimId "
-	_"   and InventDim.DataAreaId = SalesLine.DataAreaId "
+	_"   and InventDim.DataAreaId = SalesLine.DataAreaId and InventDim.PARTITION = SalesLine.PARTITION "
 	_" 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 "
+    _"   and Kenmerk.PARTITION=SalesLine.PARTITION"
+	_" left outer join AduCustomerFormNotes as ProdNotes on ProdNotes.REFTABLEID=359 and ProdNotes.REFRECID=SalesLine.RECID and ProdNotes.ADUBODYTYPE=5 and ProdNotes.PARTITION=SalesLine.PARTITION "
+	_" left outer join AduCustomerFormNotes as LijnNotes on LijnNotes.REFTABLEID=359 and LijnNotes.REFRECID=SalesLine.RECID and LijnNotes.ADUBODYTYPE=1 and LijnNotes.PARTITION=SalesLine.PARTITION "
+	_" left outer join AduCustomerFormNotes as OrdNotes on OrdNotes.REFTABLEID=366 and OrdNotes.REFRECID=ORD.RECID and OrdNotes.ADUBODYTYPE=1 and OrdNotes.PARTITION=ORD.PARTITION "
+	_" where ORD.SALESTYPE = 3 " 
+	; SalesType values: Journal = 0, Sales (order) = 3, Return order = 4
 
 	Quit SqlStatement
 ]]></Implementation>