Index: AX/Uitgaand/PM/ProductVertaling/impl/ProductTaalIterator.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/PM/ProductVertaling/impl/ProductTaalIterator.cls.xml	(revision 0)
+++ AX/Uitgaand/PM/ProductVertaling/impl/ProductTaalIterator.cls.xml	(revision 44736)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.PM.ProductVertaling.impl.ProductTaalIterator">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="ProductId">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Iterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ProductId:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ProductId = ProductId
+	Set ..Iterator = ##class(AXimpl.Admin.DOM.enu.Taal).ValueListIterator()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..Iterator.HasNext()
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>%CacheString</ReturnType>
+<Implementation><![CDATA[	Quit $ListBuild(..ProductId,..Iterator.Next())
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+<Implementation><![CDATA[	Do ..Iterator.Reset()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/enu/Taal/AutoComplete.cls.xml
===================================================================
diff -u -r43486 -r44736
--- DOM/enu/Taal/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 43486)
+++ DOM/enu/Taal/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 44736)
@@ -10,58 +10,53 @@
 <Super>%SerialObject</Super>
 
 <Property name="Deens">
-<Type>DOM.enu.Taal</Type>
+<Type>%String</Type>
 <InitialExpression>"DA"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="Duits">
-<Type>DOM.enu.Taal</Type>
+<Type>%String</Type>
 <InitialExpression>"D"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="Engels">
-<Type>DOM.enu.Taal</Type>
+<Type>%String</Type>
 <InitialExpression>"E"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="Frans">
-<Type>DOM.enu.Taal</Type>
+<Type>%String</Type>
 <InitialExpression>"F"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="Italiaans">
-<Type>DOM.enu.Taal</Type>
+<Type>%String</Type>
 <InitialExpression>"IT"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="Nederlands">
-<Type>DOM.enu.Taal</Type>
+<Type>%String</Type>
 <InitialExpression>"N"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="Spaans">
-<Type>DOM.enu.Taal</Type>
+<Type>%String</Type>
 <InitialExpression>"ES"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<StreamLocation>^DOM.enu.Taal.AutoCompleteS</StreamLocation>
-</Storage>
 </Class>
 
 
Index: AXimpl/Admin/DOM/enu/Taal.cls.xml
===================================================================
diff -u
--- AXimpl/Admin/DOM/enu/Taal.cls.xml	(revision 0)
+++ AXimpl/Admin/DOM/enu/Taal.cls.xml	(revision 44736)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Admin.DOM.enu.Taal">
+<ClassType>datatype</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Enumeration</Super>
+
+<Parameter name="VALUELIST">
+<Default>,F,N,E,D</Default>
+</Parameter>
+
+<Parameter name="DISPLAYLIST">
+<Default>,Frans,Nederlands,Engels,Duits</Default>
+</Parameter>
+
+<Method name="Nederlands">
+<ClassMethod>1</ClassMethod>
+<ReturnType>AXimpl.Admin.DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	quit "N"
+]]></Implementation>
+</Method>
+
+<Method name="Engels">
+<ClassMethod>1</ClassMethod>
+<ReturnType>AXimpl.Admin.DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	quit "E"
+]]></Implementation>
+</Method>
+
+<Method name="Duits">
+<ClassMethod>1</ClassMethod>
+<ReturnType>AXimpl.Admin.DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	quit "D"
+]]></Implementation>
+</Method>
+
+<Method name="Frans">
+<ClassMethod>1</ClassMethod>
+<ReturnType>AXimpl.Admin.DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	quit "F"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/PM/ProductVertaling/impl/ProductVertalingDixfConverter.cls.xml
===================================================================
diff -u -r44727 -r44736
--- AX/Uitgaand/PM/ProductVertaling/impl/ProductVertalingDixfConverter.cls.xml	(.../ProductVertalingDixfConverter.cls.xml)	(revision 44727)
+++ AX/Uitgaand/PM/ProductVertaling/impl/ProductVertalingDixfConverter.cls.xml	(.../ProductVertalingDixfConverter.cls.xml)	(revision 44736)
@@ -3,32 +3,18 @@
 <Class name="AX.Uitgaand.PM.ProductVertaling.impl.ProductVertalingDixfConverter">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="AxProduct">
-<Type>AXdixf.ProductVertaling.ProductVertaling</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="Convert">
 <FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,Taal:%String</FormalSpec>
 <ReturnType>AXdixf.ProductVertaling.ProductVertaling</ReturnType>
 <Implementation><![CDATA[
-	Set ..AxProduct = ##class(AXdixf.ProductVertaling.ProductVertaling).%New()
+	Set AxProduct = ##class(AXdixf.ProductVertaling.ProductVertaling).%New()
 	
-	Set ..AxProduct.Description = ""
-	Set ..AxProduct.LanguageId = Taal
-	Set ..AxProduct.Name = Product.Basis.KortTekst
-	Set ..AxProduct.DisplayProductNumber = Product.Basis.IdentNummer
+	Set AxProduct.Description = Product.Tekst.GetOmschrijving(Taal,"")
+	Set AxProduct.LanguageId = ""
+	Set AxProduct.Name = Product.Basis.KortTekst
+	Set AxProduct.DisplayProductNumber = Product.Basis.IdentNummer
 	
-	Quit ..AxProduct
+	Quit AxProduct
 ]]></Implementation>
 </Method>
 </Class>
Index: AX/Uitgaand/PM/ProductVertaling/impl/ProductVertalingIterator.cls.xml
===================================================================
diff -u -r44720 -r44736
--- AX/Uitgaand/PM/ProductVertaling/impl/ProductVertalingIterator.cls.xml	(.../ProductVertalingIterator.cls.xml)	(revision 44720)
+++ AX/Uitgaand/PM/ProductVertaling/impl/ProductVertalingIterator.cls.xml	(.../ProductVertalingIterator.cls.xml)	(revision 44736)
@@ -3,13 +3,13 @@
 <Class name="AX.Uitgaand.PM.ProductVertaling.impl.ProductVertalingIterator">
 <Super>TECH.RegisteredObject,TECH.Iterator</Super>
 
-<Property name="DynIterator">
-<Type>TECH.Iterator</Type>
+<Property name="QueryAPI">
+<Type>TECH.Query.QueryAPI</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="QueryAPI">
-<Type>TECH.Query.QueryAPI</Type>
+<Property name="Converter">
+<Type>AX.Uitgaand.PM.ProductVertaling.impl.ProductVertalingDixfConverter</Type>
 <Private>1</Private>
 </Property>
 
@@ -18,8 +18,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="Converter">
-<Type>AX.Uitgaand.PM.ProductVertaling.impl.ProductVertalingDixfConverter</Type>
+<Property name="Iterator">
+<Type>TECH.Iterator</Type>
 <Private>1</Private>
 </Property>
 
@@ -31,11 +31,14 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
+	Set ..Converter = ##class(AX.Uitgaand.PM.ProductVertaling.impl.ProductVertalingDixfConverter).%New()
+	
 	Do ..VoerUitQuery()
 	Set Filter = ##class(AX.Uitgaand.PM.ProductVertaling.impl.ProductVertalingIteratorFilter).%New()
 	Set ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
-	Set ..DynIterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator,,Filter)
-	Set ..Converter = ##class(AX.Uitgaand.PM.ProductVertaling.impl.ProductVertalingDixfConverter).%New()
+	Set DynIterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator,"Item.GetData(1)",Filter)
+	set ..Iterator = ##class(TECH.CombinedIterator).%New(DynIterator,"AX.Uitgaand.PM.ProductVertaling.impl.ProductTaalIterator")
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -46,25 +49,24 @@
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' AND KortTekst NOT LIKE 'GEN%' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2')"
 	// Indien nodig is hieronder een filter voorzien om het resultaat te beperken tot overzichtelijk, voor debugging:
-	_" and ID in (1175,1988,2865,161441,161442,254245,254258,268026,353741,353743,353744,383880,665626,668615,682391,"
-	_"709825,830257,830507,878186,878220,906194,924268,1038806,1039173,1039208,1067709,1067714,1124771,1155640,1168369,1168689,"
-	_"1168696,1169509,1194443,1247980,1259381,1359867,1425095,1425096,1432225,1572233)"
+	_" and ID in (1175,1988,2865,6945,161441,1342834,1432651)"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
 
 <Method name="HasNext">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..DynIterator.HasNext()
+<Implementation><![CDATA[	Quit ..Iterator.HasNext()
 ]]></Implementation>
 </Method>
 
 <Method name="Next">
 <ReturnType>AXdixf.ProductVertaling.ProductVertaling</ReturnType>
 <Implementation><![CDATA[
-	Set ProductVertaling = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..DynIterator.Next().GetData(1))
-	#dim ConvertedProductVertaling As AXdixf.ProductVertaling.ProductVertaling = ..Converter.Convert(ProductVertaling)
-	Quit ConvertedProductVertaling
+	#dim Item As %List = ..Iterator.Next()
+	Set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New($ListGet(Item,1))
+	#dim Taal As AXimpl.Admin.DOM.enu.Taal = $ListGet(Item,2)	
+	Quit ..Converter.Convert(Product, Taal)
 ]]></Implementation>
 </Method>
 </Class>
Index: AXimpl/Admin/DOM/enu/Taal/Verwerker.cls.xml
===================================================================
diff -u
--- AXimpl/Admin/DOM/enu/Taal/Verwerker.cls.xml	(revision 0)
+++ AXimpl/Admin/DOM/enu/Taal/Verwerker.cls.xml	(revision 44736)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Admin.DOM.enu.Taal.Verwerker">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie methoden moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+
+<Method name="Verwerk">
+<Final>1</Final>
+<FormalSpec>Taal:AXimpl.Admin.DOM.enu.Taal</FormalSpec>
+<Implementation><![CDATA[
+	If Taal = "D" {
+		Do ..VerwerkDuits()
+	} ElseIf Taal = "E" {
+		Do ..VerwerkEngels()
+	} ElseIf Taal = "F" {
+		Do ..VerwerkFrans()
+	} ElseIf Taal = "N" {
+		Do ..VerwerkNederlands()
+	} Else {
+		Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(Taal,"AXimpl.Admin.DOM.enu.Taal",$classname())
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDuits">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkEngels">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkFrans">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkNederlands">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/Admin/DOM/enu/Taal/AutoComplete.cls.xml
===================================================================
diff -u
--- AXimpl/Admin/DOM/enu/Taal/AutoComplete.cls.xml	(revision 0)
+++ AXimpl/Admin/DOM/enu/Taal/AutoComplete.cls.xml	(revision 44736)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Admin.DOM.enu.Taal.AutoComplete">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie Eigenschapn moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<ClassType>serial</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SerialObject</Super>
+
+<Property name="Duits">
+<Type>%String</Type>
+<InitialExpression>"D"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="Engels">
+<Type>%String</Type>
+<InitialExpression>"E"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="Frans">
+<Type>%String</Type>
+<InitialExpression>"F"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="Nederlands">
+<Type>%String</Type>
+<InitialExpression>"N"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+</Class>
+
+
+</Export>