Index: AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml
===================================================================
diff -u -r40739 -r40869
--- AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml	(.../ProductIterator.cls.xml)	(revision 40739)
+++ AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml	(.../ProductIterator.cls.xml)	(revision 40869)
@@ -35,13 +35,8 @@
 <Method name="VoerUitQuery">
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim SqlTableProdProduct As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName("Prod.Product")
-	#dim SqlTableProdProductTekst As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName("Prod.ProductTekst")
 	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT ProdProduct.IdentNummer, ProdProduct.OmschrijvingN1, ProdProduct.OmschrijvingN2, ProdProductTekst.OmschrijvingN3,"
-		_" ProdProductTekst.OmschrijvingN4, ProdProductTekst.OmschrijvingN5, KortTekst FROM "_SqlTableProdProduct_" ProdProduct, "
-		_SqlTableProdProductTekst_" ProdProductTekst WHERE ProdProduct.ProductNr = ProdProductTekst.ProductNr AND "
-		_"isnull(ProdProduct.Gentype,'')='' and korttekst not like 'GEN%'"
+	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%'"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
@@ -55,8 +50,9 @@
 <Method name="Next">
 <ReturnType>AXdixf.Product.Product</ReturnType>
 <Implementation><![CDATA[
-	#dim Product As AXdixf.Product.Product = ..Converter.Convert(..ResultSet)
-	Quit Product
+	set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..ResultSet.GetData(1))
+	#dim ConvertedProduct As AXdixf.Product.Product = ..Converter.Convert(Product)
+	Quit ConvertedProduct
 ]]></Implementation>
 </Method>
 </Class>