Index: APPS/common/ProductCriteria/impl/ProductZoekOpCriteria.cls.xml
===================================================================
diff -u -r3045 -r3067
--- APPS/common/ProductCriteria/impl/ProductZoekOpCriteria.cls.xml	(.../ProductZoekOpCriteria.cls.xml)	(revision 3045)
+++ APPS/common/ProductCriteria/impl/ProductZoekOpCriteria.cls.xml	(.../ProductZoekOpCriteria.cls.xml)	(revision 3067)
@@ -15,51 +15,60 @@
 <Private>1</Private>
 </Property>
 
+<Property name="TabellenMetProductID">
+<Type>%String</Type>
+<Collection>array</Collection>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="InitQueryBuilderStructuur">
+<Private>1</Private>
 <Implementation><![CDATA[
 	Set Boom = ##class(TECH.Algo.Boom.Boom).%New(##class(TECH.Algo.SQL.QueryEngine.CombinatieConditie).%New(##class(TECH.Algo.SQL.QueryEngine.enu.CombinatieConditieOperator).Of()))
 	Set ..DiepteEerstBoomBuilder = ##class(TECH.Algo.Boom.DiepteEerstBoomBuilder).%New(Boom)
 	Set ..QueryBuilder = ##class(TECH.Algo.SQL.QueryEngine.QueryBuilder).%New()
-	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="BouwZoekQuery">
 <FormalSpec>Criterium:APPS.common.ProductCriteria.ProductCriterium</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	Do ..InitQueryBuilderStructuur()
 	Do Criterium.Accept(##this)
+	Do ..VerwerkTabellenMetEenProductID()
 	Do ..QueryBuilder.ZetWhereConditie(..DiepteEerstBoomBuilder.GeefBoom().GeefWortel().GeefKindIterator().Next())
-	Set FromTabel = ..QueryBuilder.GeefTabelIterator().Next()
-	Do ..QueryBuilder.SelecteerVeldVanTabel("ID",FromTabel)
 	Quit ..QueryBuilder.GeefQueryString()
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkProductCodeStartMetCrit">
 <FormalSpec>ProductCodeStartMetCriterium:APPS.common.ProductCriteria.ProductCodeStartMetCriterium</FormalSpec>
 <Implementation><![CDATA[
-	Set Tabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("Prod.Product")
-	Do ..QueryBuilder.VoegToeTabel(Tabel)
-	Do ..VoegToeEnkelvoudigeConditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("KortTekst LIKE '"_ProductCodeStartMetCriterium.GeefStartMet()_"'"))
+	Set ProductTabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("Prod.Product")
+	Do ..DefinieerTabelMetProductID("ID",ProductTabel)
+	Do ..VoegToeEnkelvoudigeConditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("KortTekst LIKE '"_ProductCodeStartMetCriterium.GeefStartMet()_"%'"))
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkClassificatieCriterium">
-<FormalSpec>ClassificatieCriterium:APPS.common.ProductCriteria.ClassificatieCriterium</FormalSpec>
+<FormalSpec>ClassificatieCriterium:APPS.common.ProductCriteria.impl.ClassificatieCriterium</FormalSpec>
 <Implementation><![CDATA[
-	Set ProductTabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("Prod.Product")
 	Set ProductKlasTabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("Prod.ProductKlas")
+	Do ..DefinieerTabelMetProductID("ID",ProductKlasTabel)
+	
+	// Zelf nog een expliciete join definiëren
 	Set ProductKlasKlasTabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New("Prod_Klas.Klas")
-	Do ..QueryBuilder.VoegToeTabel(ProductKlasTabel)
 	Do ..QueryBuilder.VoegToeTabel(ProductKlasKlasTabel)
-	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("ID", ProductKlasTabel, "Klas", ProductTabel)
-	Do ..QueryBuilder.VoegToeForeignKey(ForeignKey)
-	Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("ID", ProductKlasKlasTabel, "Klas", ProductKlasTabel)
-	Do ..QueryBuilder.VoegToeForeignKey(ForeignKey)
+	Do ..QueryBuilder.VoegToeForeignKey(##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New("ID", ProductKlasKlasTabel, "Klas", ProductKlasTabel))
+	
 	Do ..VoegToeEnkelvoudigeConditie(##class(TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie).%New("Prod_Klas.Klas.ID = "_ClassificatieCriterium.GeefClassificatieID()))
 ]]></Implementation>
 </Method>
@@ -70,6 +79,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BeginSamengesteldCriterium">
+<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.SamengesteldCriterium</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="EindeSamengesteldCriterium">
+<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.SamengesteldCriterium</FormalSpec>
+<Implementation><![CDATA[	Do ..DiepteEerstBoomBuilder.StijgNiveau()
+]]></Implementation>
+</Method>
+
 <Method name="VoegToeEnkelvoudigeConditie">
 <FormalSpec>EnkelvoudigeConditie:TECH.Algo.SQL.QueryEngine.EnkelvoudigeConditie</FormalSpec>
 <Private>1</Private>
@@ -78,5 +98,34 @@
 	Do ..DiepteEerstBoomBuilder.StijgNiveau()
 ]]></Implementation>
 </Method>
+
+<Method name="DefinieerTabelMetProductID">
+<FormalSpec>ProductIDVeld:%String,Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do ..TabellenMetProductID.SetAt(ProductIDVeld,Tabel.GeefNaam())
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTabellenMetEenProductID">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Iterator = ##class(TECH.ListIterator).%New(..TabellenMetProductID)
+	If (Iterator.HasNext())
+	{
+		Set FromTabelProductIDVeld = Iterator.Next()
+		Set FromTabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New(Iterator.Key())
+		Do ..QueryBuilder.ZetFromTabel(FromTabel)
+		Do ..QueryBuilder.SelecteerVeldVanTabel(FromTabelProductIDVeld, FromTabel)
+	}
+	While (Iterator.HasNext())
+	{
+		Set ProductIDVeld = Iterator.Next()
+		Set Tabel = ##class(TECH.Algo.SQL.QueryEngine.Tabel).%New(Iterator.Key())
+		Do ..QueryBuilder.VoegToeTabel(Tabel)
+		Set ForeignKey = ##class(TECH.Algo.SQL.QueryEngine.ForeignKey).%New(ProductIDVeld, Tabel, FromTabelProductIDVeld, FromTabel)
+		Do ..QueryBuilder.VoegToeForeignKey(ForeignKey)
+	}
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/common/ProductCriteria/OfCriterium.cls.xml
===================================================================
diff -u -r3045 -r3067
--- APPS/common/ProductCriteria/OfCriterium.cls.xml	(.../OfCriterium.cls.xml)	(revision 3045)
+++ APPS/common/ProductCriteria/OfCriterium.cls.xml	(.../OfCriterium.cls.xml)	(revision 3067)
@@ -3,39 +3,18 @@
 <Class name="APPS.common.ProductCriteria.OfCriterium">
 <ClassType>persistent</ClassType>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>APPS.common.ProductCriteria.ProductCriterium</Super>
+<Super>APPS.common.ProductCriteria.SamengesteldCriterium</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="Criteria">
-<Type>APPS.common.ProductCriteria.ProductCriterium</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
 <Method name="Accept">
 <FormalSpec>Visitor:APPS.common.ProductCriteria.ProductCriteriumVisitor</FormalSpec>
 <Implementation><![CDATA[
+	Do ##super(Visitor)
 	Do Visitor.VerwerkOfCriterium(##this)
-	Set CriteriaIterator = ..GeefCriteriaIterator()
-	While (CriteriaIterator.HasNext())
-	{
-		Do CriteriaIterator.Next().Accept(Visitor)
-	}
+	Do ..VisitKindCriteria(Visitor)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefCriteriaIterator">
-<ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..Criteria)
-]]></Implementation>
-</Method>
-
-<Method name="VoegToeCriteria">
-<FormalSpec>Waarde:APPS.common.ProductCriteria.ProductCriterium</FormalSpec>
-<Implementation><![CDATA[	Do ..Criteria.Insert(Waarde)
-]]></Implementation>
-</Method>
-
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DefaultData>OfCriteriumDefaultData</DefaultData>
Index: APPS/common/ProductCriteria/ProductCriteriumVisitor.cls.xml
===================================================================
diff -u -r3045 -r3067
--- APPS/common/ProductCriteria/ProductCriteriumVisitor.cls.xml	(.../ProductCriteriumVisitor.cls.xml)	(revision 3045)
+++ APPS/common/ProductCriteria/ProductCriteriumVisitor.cls.xml	(.../ProductCriteriumVisitor.cls.xml)	(revision 3067)
@@ -8,16 +8,31 @@
 <Method name="VerwerkProductCodeStartMetCrit">
 <Abstract>1</Abstract>
 <FormalSpec>ProductCodeStartMetCriterium:APPS.common.ProductCriteria.ProductCodeStartMetCriterium</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkClassificatieCriterium">
 <Abstract>1</Abstract>
-<FormalSpec>ClassificatieCriterium:APPS.common.ProductCriteria.ClassificatieCriterium</FormalSpec>
+<FormalSpec>ClassificatieCriterium:APPS.common.ProductCriteria.impl.ClassificatieCriterium</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkOfCriterium">
 <Abstract>1</Abstract>
 <FormalSpec>OfCriterium:APPS.common.ProductCriteria.OfCriterium</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
+
+<Method name="BeginSamengesteldCriterium">
+<Abstract>1</Abstract>
+<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.SamengesteldCriterium</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="EindeSamengesteldCriterium">
+<Abstract>1</Abstract>
+<FormalSpec>SamengesteldCriterium:APPS.common.ProductCriteria.SamengesteldCriterium</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: vhUnitTest/APPS/common/ProductCriteria/TestProductCriteria.cls.xml
===================================================================
diff -u -r3045 -r3067
--- vhUnitTest/APPS/common/ProductCriteria/TestProductCriteria.cls.xml	(.../TestProductCriteria.cls.xml)	(revision 3045)
+++ vhUnitTest/APPS/common/ProductCriteria/TestProductCriteria.cls.xml	(.../TestProductCriteria.cls.xml)	(revision 3067)
@@ -9,7 +9,7 @@
 
 <Method name="TestKorttekstStartMet">
 <Implementation><![CDATA[
-	Set StartMet = ##class(APPS.common.ProductCriteria.ProductCodeStartMetCriterium).%New("OL.VLI%")
+	Set StartMet = ##class(APPS.common.ProductCriteria.ProductCodeStartMetCriterium).%New("OL.VLI")
 	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
 	Set Query = ProductZoekOpCriteria.BouwZoekQuery(StartMet)
 	
@@ -19,7 +19,7 @@
 
 <Method name="TestClassificatie">
 <Implementation><![CDATA[
-	Set Classificatie = ##class(APPS.common.ProductCriteria.ClassificatieCriterium).%New(374)
+	Set Classificatie = ##class(APPS.common.ProductCriteria.impl.ClassificatieCriterium).%New(374)
 	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
 	Set Query = ProductZoekOpCriteria.BouwZoekQuery(Classificatie)
 	
@@ -29,16 +29,36 @@
 
 <Method name="TestKTStarMetEnClassificatie">
 <Implementation><![CDATA[
-	Set StartMet = ##class(APPS.common.ProductCriteria.ProductCodeStartMetCriterium).%New("AFV%")
-	Set Classificatie = ##class(APPS.common.ProductCriteria.ClassificatieCriterium).%New(605)
+	Set StartMet = ##class(APPS.common.ProductCriteria.ProductCodeStartMetCriterium).%New("AFV")
+	Set Classificatie = ##class(APPS.common.ProductCriteria.impl.ClassificatieCriterium).%New(605)
 	Set Of = ##class(APPS.common.ProductCriteria.OfCriterium).%New()
 	Do Of.VoegToeCriteria(StartMet)
 	Do Of.VoegToeCriteria(Classificatie)
 	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
 	Set Query = ProductZoekOpCriteria.BouwZoekQuery(Of)
 	
-	Do $$$AssertEquals(Query,"SELECT Prod.Product.ID FROM Prod.Product JOIN Prod.ProductKlas ON Prod.ProductKlas.ID = Prod.Product.Klas JOIN Prod_Klas.Klas ON Prod_Klas.Klas.ID = Prod.ProductKlas.Klas WHERE (KortTekst LIKE 'AFV%' OR Prod_Klas.Klas.ID = 605)","De Query")
+	Do $$$AssertEquals(Query,"SELECT Prod.Product.ID FROM Prod.Product JOIN Prod.ProductKlas ON Prod.ProductKlas.ID = Prod.Product.ID JOIN Prod_Klas.Klas ON Prod_Klas.Klas.ID = Prod.ProductKlas.Klas WHERE (KortTekst LIKE 'AFV%' OR Prod_Klas.Klas.ID = 605)","De Query")
 ]]></Implementation>
 </Method>
+
+<Method name="TestKTStarMetEn2Classificaties">
+<Implementation><![CDATA[
+	Set StartMet = ##class(APPS.common.ProductCriteria.ProductCodeStartMetCriterium).%New("AFV")
+	Set Classificatie = ##class(APPS.common.ProductCriteria.impl.ClassificatieCriterium).%New(605)
+	Set Of = ##class(APPS.common.ProductCriteria.OfCriterium).%New()
+	Do Of.VoegToeCriteria(StartMet)
+	Do Of.VoegToeCriteria(Classificatie)
+	Set Of2 = ##class(APPS.common.ProductCriteria.OfCriterium).%New()
+	Do Of.VoegToeCriteria(Of2)
+	// Eigenlijk kan dit criteria ook direct aan de eerste "of" worden toegevoegd.
+	// Maar bij wijze van test ook een dieper geneste structuur gebruiken.
+	Do Of2.VoegToeCriteria(##class(APPS.common.ProductCriteria.impl.ClassificatieCriterium).%New(604))
+	
+	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
+	Set Query = ProductZoekOpCriteria.BouwZoekQuery(Of)
+	
+	Do $$$AssertEquals(Query,"SELECT Prod.Product.ID FROM Prod.Product JOIN Prod.ProductKlas ON Prod.ProductKlas.ID = Prod.Product.ID JOIN Prod_Klas.Klas ON Prod_Klas.Klas.ID = Prod.ProductKlas.Klas AND Prod_Klas.Klas.ID = Prod.ProductKlas.Klas WHERE (KortTekst LIKE 'AFV%' OR Prod_Klas.Klas.ID = 605 OR (Prod_Klas.Klas.ID = 604))","De Query")
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml
===================================================================
diff -u -r3044 -r3067
--- TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml	(.../QueryBuilder.cls.xml)	(revision 3044)
+++ TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml	(.../QueryBuilder.cls.xml)	(revision 3067)
@@ -28,6 +28,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="FromTabel">
+<Type>TECH.Algo.SQL.QueryEngine.Tabel</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="VoegToeTabel">
 <FormalSpec>Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
 <Implementation><![CDATA[	Do ..Tabellen.SetAt(Tabel,Tabel.GeefNaam())
@@ -40,6 +45,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetFromTabel">
+<FormalSpec>Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
+<Implementation><![CDATA[	Set ..FromTabel = Tabel
+]]></Implementation>
+</Method>
+
 <Method name="SelecteerVeldVanTabel">
 <FormalSpec>Veld:%String,Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
 <Implementation><![CDATA[	Do ..SelectieVelden.Insert(##class(TECH.Algo.SQL.QueryEngine.SelectieVeld).%New(Veld, Tabel))
@@ -73,9 +84,9 @@
 <Implementation><![CDATA[
 	Set TabellenIterator = ##class(TECH.ListIterator).%New(..Tabellen)
 	
-	Set Query = "SELECT"
-	Set Query = Query_..GeefTeSelecterenVeldenString()
-	If (TabellenIterator.HasNext()) Set Query = Query_" "_..GeefFromTabelString(TabellenIterator.Next())
+	If ('$IsObject(..FromTabel)) && (TabellenIterator.HasNext()) Do ..ZetFromTabel(TabellenIterator.Next())
+	
+	Set Query = "SELECT"_..GeefTeSelecterenVeldenString()_" "_..GeefFromTabelString()
 	While (TabellenIterator.HasNext()) { Set Query = Query_" "_..GeefJoinTabelString(TabellenIterator.Next()) }
 	If ($IsObject(..WhereConditie)) Set Query = Query_" WHERE "_..WhereConditie.MaakConditieString()
 	
@@ -100,10 +111,9 @@
 </Method>
 
 <Method name="GeefFromTabelString">
-<FormalSpec>Tabel:TECH.Algo.SQL.QueryEngine.Tabel</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "FROM "_Tabel.GeefNaam()
+<Implementation><![CDATA[	Quit "FROM "_..FromTabel.GeefNaam()
 ]]></Implementation>
 </Method>
 
Index: APPS/common/ProductCriteria/ProductZoekService.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/ProductZoekService.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/ProductZoekService.cls.xml	(revision 3067)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.ProductZoekService">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="ZoekProducten">
+<FormalSpec>Criterium:APPS.common.ProductCriteria.ProductCriterium</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	Set ProductIDLijst = ##class(%ListOfDataTypes).%New()
+	Set ProductZoekOpCriteria = ##class(APPS.common.ProductCriteria.impl.ProductZoekOpCriteria).%New()
+	Set Query = ProductZoekOpCriteria.BouwZoekQuery(Criterium)
+	Set ResultSet = ##class(%ResultSet).%New()
+	Do ResultSet.Execute(Query)
+	While (ResultSet.Next())
+	{
+		Set ProductID = ResultSet.GetData(1)
+	}
+	Quit ProductIDLijst
+]]></Implementation>
+</Method>
+</Class>
+</Export>
FishEye: Tag 3067 refers to a dead (removed) revision in file `APPS/common/ProductCriteria/BewaardProductCriterium.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/common/ProductCriteria/SamengesteldCriterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/SamengesteldCriterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/SamengesteldCriterium.cls.xml	(revision 3067)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.SamengesteldCriterium">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.ProductCriteria.ProductCriterium</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Criteria">
+<Type>APPS.common.ProductCriteria.ProductCriterium</Type>
+<Collection>list</Collection>
+<Private>1</Private>
+</Property>
+
+<Method name="Accept">
+<FormalSpec>Visitor:APPS.common.ProductCriteria.ProductCriteriumVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.BeginSamengesteldCriterium(##this)
+]]></Implementation>
+</Method>
+
+<Method name="VisitKindCriteria">
+<FormalSpec>Visitor:APPS.common.ProductCriteria.ProductCriteriumVisitor</FormalSpec>
+<Implementation><![CDATA[
+	Set CriteriaIterator = ..GeefCriteriaIterator()
+	While (CriteriaIterator.HasNext())
+	{
+		Do CriteriaIterator.Next().Accept(Visitor)
+	}
+	Do Visitor.EindeSamengesteldCriterium(##this)
+]]></Implementation>
+</Method>
+
+<Method name="GeefCriteriaIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..Criteria)
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeCriteria">
+<FormalSpec>Waarde:APPS.common.ProductCriteria.ProductCriterium</FormalSpec>
+<Implementation><![CDATA[	Do ..Criteria.Insert(Waarde)
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DefaultData>SamengesteldCriteriumDefaultData</DefaultData>
+<Data name="SamengesteldCriteriumDefaultData">
+<Structure>listnode</Structure>
+<Subscript>"SamengesteldCriterium"</Subscript>
+<Value name="1">
+<Value>Criteria</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>
Index: APPS/common/ProductCriteria/impl/BewaardProductCriterium.cls.xml
===================================================================
diff -u
--- APPS/common/ProductCriteria/impl/BewaardProductCriterium.cls.xml	(revision 0)
+++ APPS/common/ProductCriteria/impl/BewaardProductCriterium.cls.xml	(revision 3067)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.ProductCriteria.impl.BewaardProductCriterium">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%Persistent</Super>
+</Class>
+</Export>