Index: APPS/PM/dto/ZoekCriteria.cls.xml
===================================================================
diff -u -r1073 -r1388
--- APPS/PM/dto/ZoekCriteria.cls.xml	(.../ZoekCriteria.cls.xml)	(revision 1073)
+++ APPS/PM/dto/ZoekCriteria.cls.xml	(.../ZoekCriteria.cls.xml)	(revision 1388)
@@ -57,5 +57,10 @@
 <Property name="StockType">
 <Type>APPS.PM.enu.StockType</Type>
 </Property>
+
+<Property name="GeneratieType">
+<Type>APPS.PM.enu.GeneratieType</Type>
+<Collection>list</Collection>
+</Property>
 </Class>
 </Export>
Index: APPS/PM/ProductService.cls.xml
===================================================================
diff -u -r1233 -r1388
--- APPS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 1233)
+++ APPS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 1388)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="APPS.PM.ProductService">
-<IncludeCode>TECH.Error</IncludeCode>
+<IncludeCode>TECH.Error,APPS.PM.OL.Common</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
@@ -63,6 +63,7 @@
     Do rsSearch.Execute(pxCriteria,pxSearchFormat)
     
     Set ProductAPI =  ##class(DOM.DomeinContext).Instance().GeefProductAPI()
+    Set KenmerkenService = ##class(APPS.PM.KenmerkenService).%New()
     
     // [ Review CSC -> JBL ] Array gebruiken om sneller te zoeken in de lijst van PRNr's
     // Je kan ook vooraf beter een array opbouwen met als sleutel de korttekst en eentje met de geopendna datum
@@ -86,6 +87,7 @@
 			While (ProductIDIterator.HasNext() && ((Criteria.MaxAantalResultaten = "") || (AantalToegevoegde < Criteria.MaxAantalResultaten))){
 				Set ProductID =  ProductIDIterator.Next()
 				Set Toevoegen = 1
+				
 				/// Als op exacte korttekst gezocht word, die hier controleren.
 				If (Criteria.ExacteKorttekst && (Criteria.SoortProductID = ##class(APPS.PM.enu.SoortProductID).Korttekst()) && (ProductID.Korttekst '= Criteria.ProductID)){
 					Set Toevoegen = 0
@@ -94,7 +96,26 @@
 				If (Criteria.GeopendNa && (Product.GeefOpeningDatum() <= Criteria.GeopendNa)){
 					Set Toevoegen = 0	
 				}
+				/// Als generatietype is opgegeven hierop filteren
+				If (Criteria.GeneratieType && (Criteria.GeneratieType '= "") && (Criteria.GeneratieType.Count() > 0) && ('Criteria.GeneratieType.Find(##class(APPS.PM.enu.GeneratieType).Onbepaald()))){						
+					Set UnID = ##class(BL.Kenm.ProdMulti).GetFullID(ProductID.PRNr, ProductID.MultipleNr)						
+					Set DataDefID= ##class(Prod.Kenmerk.DataDefinitie).BuildDataDefinitionID($$$KenmerkGroepID,UnID,"GeneratieType")
+					If ##class(Prod.Kenmerk.DataDefinitie).%ExistsId(DataDefID)
+					{
+						Set GeneratieTypeIt = ##class(TECH.ListIterator).%New(Criteria.GeneratieType)
+					    While (GeneratieTypeIt.HasNext()){
+							Set GeneratieType = GeneratieTypeIt.Next()					
+							Set DataDef=##class(Prod.Kenmerk.DataDefinitie).%OpenId(DataDefID)
+							If ((GeneratieType) '= (DataDef.Waarden.GetAt(1))){
+								 Set Toevoegen = 0	
+							}
+					    }
+					}Else{
+						Set Toevoegen = 0	
+					}
+				}
 				
+				/// TOEVOEGEN				
 				If Toevoegen {					
 					Do ProductenLijst.HerkendeProducten.Insert(ProductID)	
 					Set AantalToegevoegde = AantalToegevoegde + 1	
Index: vhUnitTest/APPS/PM/TestProductService.cls.xml
===================================================================
diff -u -r1248 -r1388
--- vhUnitTest/APPS/PM/TestProductService.cls.xml	(.../TestProductService.cls.xml)	(revision 1248)
+++ vhUnitTest/APPS/PM/TestProductService.cls.xml	(.../TestProductService.cls.xml)	(revision 1388)
@@ -3,6 +3,7 @@
 <Class name="vhUnitTest.APPS.PM.TestProductService">
 <Description>
 Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.PM.TestProductService")</Description>
+<IncludeCode>APPS.PM.OL.Common</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
@@ -136,6 +137,73 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestSearchGeneratieTypeMaster">
+<Implementation><![CDATA[
+	Set GeneratieTypes = ##class(%ListOfDataTypes).%New()
+	Do GeneratieTypes.Insert(##class(APPS.PM.enu.GeneratieType).Master())
+	Do ..SearchGeneratieType(GeneratieTypes)
+]]></Implementation>
+</Method>
+
+<Method name="TestSearchGeneratieTypeAuto">
+<Implementation><![CDATA[
+	Set GeneratieTypes = ##class(%ListOfDataTypes).%New()
+	Do GeneratieTypes.Insert(##class(APPS.PM.enu.GeneratieType).Auto())
+	Do ..SearchGeneratieType(GeneratieTypes)
+]]></Implementation>
+</Method>
+
+<Method name="TestSearchGeneratieTypeAutoMast">
+<Implementation><![CDATA[
+	Set GeneratieTypes = ##class(%ListOfDataTypes).%New()
+	Do GeneratieTypes.Insert(##class(APPS.PM.enu.GeneratieType).Auto())
+	Do GeneratieTypes.Insert(##class(APPS.PM.enu.GeneratieType).Master())
+	Do ..SearchGeneratieType(GeneratieTypes)
+]]></Implementation>
+</Method>
+
+<Method name="TestSearchGeneratieTypeOnbep">
+<Implementation><![CDATA[
+	Set GeneratieTypes = ##class(%ListOfDataTypes).%New()
+	Do GeneratieTypes.Insert(##class(APPS.PM.enu.GeneratieType).Onbepaald())
+	Do ..SearchGeneratieType(GeneratieTypes)
+]]></Implementation>
+</Method>
+
+<Method name="SearchGeneratieType">
+<FormalSpec>GeneratieTypes:%ListOfDataTypes</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set KortTekst = "OL"
+	
+	Set Criteria=##class(APPS.PM.dto.ZoekCriteria).%New()
+	Set Criteria.SoortProductID=##class(APPS.PM.enu.SoortProductID).Korttekst()
+	Set Criteria.ExacteKorttekst = 0
+	Set Criteria.ProductID = KortTekst
+	Set Criteria.GeneratieType = GeneratieTypes
+	Set ProductService =  ##class(APPS.PM.ProductService).%New()
+	Set ProductenLijst = ProductService.ZoekProducten(Criteria).HerkendeProducten
+	Set ProductIt = ##class(TECH.ListIterator).%New(ProductenLijst)
+	While (ProductIt.HasNext()){
+		Set ProductID =  ProductIt.Next()
+		Set UnID = ##class(BL.Kenm.ProdMulti).GetFullID(ProductID.PRNr, ProductID.MultipleNr)						
+		Set DataDefID= ##class(Prod.Kenmerk.DataDefinitie).BuildDataDefinitionID($$$KenmerkGroepID,UnID,"GeneratieType")
+		If ##class(Prod.Kenmerk.DataDefinitie).%ExistsId(DataDefID)
+		{				
+			Set DataDef=##class(Prod.Kenmerk.DataDefinitie).%OpenId(DataDefID)
+			Set JuistType = 0
+			For i = 1 : 1 : GeneratieTypes.Count()
+			{
+				If (GeneratieTypes.Find(##class(APPS.PM.enu.GeneratieType).Onbepaald()) || (DataDef.Waarden.GetAt(1) = GeneratieTypes.GetAt(i))){
+					Set JuistType = 1
+				}
+			}
+			Do $$$AssertTrue(JuistType,"Het product "_ProductID.PRNr_" heeft een juist generatietype.")
+		}
+	}
+]]></Implementation>
+</Method>
+
 <Method name="TestSearchLeverancier">
 <Implementation><![CDATA[
 	
Index: APPS/PM/enu/GeneratieType.cls.xml
===================================================================
diff -u
--- APPS/PM/enu/GeneratieType.cls.xml	(revision 0)
+++ APPS/PM/enu/GeneratieType.cls.xml	(revision 1388)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.PM.enu.GeneratieType">
+<ClassType>datatype</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="VALUELIST">
+<Default>,MASTER,SINGLE,AUTO,ONBEPAALD</Default>
+</Parameter>
+
+<Parameter name="DISPLAYLIST">
+<Default>;Master;Single;Auto;Onbepaald</Default>
+</Parameter>
+
+<Method name="Master">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Quit "MASTER"
+]]></Implementation>
+</Method>
+
+<Method name="Single">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Quit "SINGLE"
+]]></Implementation>
+</Method>
+
+<Method name="Auto">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Quit "AUTO"
+]]></Implementation>
+</Method>
+
+<Method name="Onbepaald">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Quit "ONBEPAALD"
+]]></Implementation>
+</Method>
+</Class>
+</Export>