Index: AXimpl/Controle/Order/Ax/AxOrderLijnIterator.cls.xml
===================================================================
diff -u -r49225 -r49431
--- AXimpl/Controle/Order/Ax/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 49225)
+++ AXimpl/Controle/Order/Ax/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 49431)
@@ -37,26 +37,31 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	// Iteratie 2:
-	Set SqlStatement = "select salesLine.SalesId,salesLine.CustAccount,salesline.inventtransid,salesline.itemid,salesline.CONFIRMEDDLV,salesline.QtyOrdered"
-	_",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"
-	_",salesline.REMAINSALESPHYSICAL as OpenstaandeHoeveelheid"
-	_",CONFIGID"
-	_",inventtransorigin.ADUSOPRContractId"
-	_",isnull(LogisticsPostalAddress.CountryRegionId,'') as CountryRegionId"
-	_",isnull(LogisticsPostalAddress.City,'') as City"
-	_",isnull(LogisticsPostalAddress.Street,'') as Street"
-	_",isnull(LogisticsPostalAddress.Zipcode,'') as Zipcode"
-	_" from SALESLINE join inventdim on inventdim.INVENTDIMID = salesline.INVENTDIMID and inventdim.DATAAREAID = SALESLINE.DATAAREAID and inventdim.PARTITION = salesline.PARTITION "
+	
+	Set SqlStatement = "Select salesLine.SALESID,salesLine.CUSTACCOUNT,salesline.INVENTTRANSID,salesline.ITEMID,salesline.CONFIRMEDDLV,salesline.RECEIPTDATECONFIRMED,salesline.QTYORDERED"
+	_"  ,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"
+	_"  ,salesline.REMAINSALESPHYSICAL as OPENSTAANDEHOEVEELHEID,ADMINPRODUCTNUMMER "
+	_"  ,inventtransorigin.ADUSOPRCONTRACTID "
+	_"  ,InventDim.CONFIGID "
+	_"  ,isnull(LogisticsPostalAddress.CountryRegionId,'') as COUNTRYREGIONID "
+	_"  ,isnull(LogisticsPostalAddress.City,'') as CITY "
+	_"  ,isnull(LogisticsPostalAddress.Street,'') as STREET "
+	_"  ,isnull(LogisticsPostalAddress.Zipcode,'') as ZIPCODE "
+	_"from SALESLINE "
+	_"join inventdim on inventdim.INVENTDIMID = salesline.INVENTDIMID and inventdim.DATAAREAID = SALESLINE.DATAAREAID and inventdim.PARTITION = salesline.PARTITION "
 	_"join SALESTABLE on SALESTABLE.SALESID = salesline.SALESID and SALESTABLE.DATAAREAID = salesline.DATAAREAID and salestable.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 LOGISTICSPOSTALADDRESS on LOGISTICSPOSTALADDRESS.RECID = salesline.DELIVERYPOSTALADDRESS and LOGISTICSPOSTALADDRESS.PARTITION = salesline.PARTITION "
 	_"join INVENTTRANSORIGIN on INVENTTRANSORIGIN.INVENTTRANSID = salesline.INVENTTRANSID and INVENTTRANSORIGIN.DATAAREAID = salesline.DATAAREAID and "
-	_"INVENTTRANSORIGIN.PARTITION = salesline.PARTITION where salestable.SALESSTATUS = 1 and salestable.SALESTYPE = 3 and salesline.SALESQTY >= 0 "
-	_"and salesLine.DATAAREAID = 'VHBE' and salesline.PARTITION = '5637144576' "
-	_"and salesline.REMAINSALESPHYSICAL - 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) > 0 "
-	_"ORDER BY salesline.inventtransid"
+	_"   INVENTTRANSORIGIN.PARTITION = salesline.PARTITION "
+	_"where salestable.SALESSTATUS = 1 and salestable.SALESTYPE = 3 and salesline.SALESQTY >= 0 "
+	_"  and salesLine.DATAAREAID = 'VHBE' and salesline.PARTITION = '5637144576' "
+	_"  and salesline.REMAINSALESPHYSICAL - 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) > 0 "
+	_"order by salesline.inventtransid"
 	
 	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
 ]]></Implementation>
@@ -71,9 +76,10 @@
 <Method name="Next">
 <ReturnType>AXimpl.Controle.Order.OrderLijn</ReturnType>
 <Implementation><![CDATA[
-	#dim ConvertedAxProductOrderLijn As AXimpl.Controle.Order.OrderLijn = ..Converter.Convert(..ResultSet)
+ 	Quit ..ResultSet
+	;#dim ConvertedAxProductOrderLijn As AXimpl.Controle.Order.OrderLijn = ..Converter.Convert(..ResultSet)
 	
-	Quit ConvertedAxProductOrderLijn
+	;Quit ConvertedAxProductOrderLijn
 ]]></Implementation>
 </Method>