Index: APPS/PM/ProductService.cls.xml
===================================================================
diff -u -r1388 -r1407
--- APPS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 1388)
+++ APPS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 1407)
@@ -97,14 +97,18 @@
 					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()))){						
+				If (Criteria.GeneratieType && (Criteria.GeneratieType '= "") && (Criteria.GeneratieType.Count() > 0) && ('Criteria.GeneratieType.Find(##class(APPS.PM.enu.GeneratieType).Onbepaald()))){   ; [Review WV  JBL MasterZoek]  Conditie 1 en 2 vervangen door :  $IsObject(Criteria.GeneratieType)  !!!
 					Set UnID = ##class(BL.Kenm.ProdMulti).GetFullID(ProductID.PRNr, ProductID.MultipleNr)						
+					
+					; [Review WV  JBL MasterZoek] rechtstreeks opvragen via :  
+					; 							  Set GeneratieTypeDataDef=$LG(##class(Prod.Kenmerk.DataDefinitie).Get($$$KenmerkGroepID,UnID,"GeneratieType"),1)
+					
 					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 GeneratieType = GeneratieTypeIt.Next()					               
 							Set DataDef=##class(Prod.Kenmerk.DataDefinitie).%OpenId(DataDefID)
 							If ((GeneratieType) '= (DataDef.Waarden.GetAt(1))){
 								 Set Toevoegen = 0	
Index: vhUnitTest/APPS/PM/TestProductService.cls.xml
===================================================================
diff -u -r1388 -r1407
--- vhUnitTest/APPS/PM/TestProductService.cls.xml	(.../TestProductService.cls.xml)	(revision 1388)
+++ vhUnitTest/APPS/PM/TestProductService.cls.xml	(.../TestProductService.cls.xml)	(revision 1407)
@@ -187,7 +187,7 @@
 	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")
+		Set DataDefID= ##class(Prod.Kenmerk.DataDefinitie).BuildDataDefinitionID($$$KenmerkGroepID,UnID,"GeneratieType")   ; [Review WV  JBL MasterZoek]  Zelfde opmerking als in APPS : classmethod Get() kan gebruikt worden 
 		If ##class(Prod.Kenmerk.DataDefinitie).%ExistsId(DataDefID)
 		{				
 			Set DataDef=##class(Prod.Kenmerk.DataDefinitie).%OpenId(DataDefID)