Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/PropertyFilter.cls.xml
===================================================================
diff -u -r72065 -r72066
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/PropertyFilter.cls.xml	(.../PropertyFilter.cls.xml)	(revision 72065)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/PropertyFilter.cls.xml	(.../PropertyFilter.cls.xml)	(revision 72066)
@@ -1,17 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.PropertyFilter">
-<Super>TECH.RegisteredObject</Super>
+<Super>APPS.PM.Maatwerk.dto.IngegevenKenmerkenVisitor</Super>
 
+<Property name="GefilterdeProperties">
+<Type>%ListOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PropertyIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="Filter">
-<FormalSpec>PropertiesIterator:TECH.ListIterator</FormalSpec>
-<ReturnType>%ListOfDataTypes</ReturnType>
+<FormalSpec>IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
-	Set Gefilterd = ##class(%ListOfDataTypes).%New()
+	Set ..PropertyIterator = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GeefProperties(IngegevenKenmerken.%ClassName(1)))
+	Do ##class(Tools.Wlip).%New(26).String("HierAl")
+	Set ..GefilterdeProperties = ##class(%ListOfDataTypes).%New()
 	
-	While PropertiesIterator.HasNext() {
-		#dim PropertyNaam As %String = PropertiesIterator.Next()
+	Do IngegevenKenmerken.Accept($this)
+	
+	Quit ##class(TECH.ListIterator).%New(..GefilterdeProperties)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkLBXKenmerken">
+<FormalSpec>LBXKenmerken:APPS.PM.Maatwerk.dto.LBXKenmerken</FormalSpec>
+<Implementation><![CDATA[
+	While ..PropertyIterator.HasNext() {
+		#dim PropertyNaam As %String = ..PropertyIterator.Next()
+			
+		#dim IsGefilterd As %Boolean = ..IsGefilterdAlgemeen(PropertyNaam)		
 		
+		If ($$$Not(IsGefilterd)) {
+			Do ..GefilterdeProperties.Insert(PropertyNaam)
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTBXKenmerken">
+<FormalSpec>TBXKenmerken:APPS.PM.Maatwerk.dto.TBXKenmerken</FormalSpec>
+<Implementation><![CDATA[
+	While ..PropertyIterator.HasNext() {
+		#dim PropertyNaam As %String = ..PropertyIterator.Next()
+			
+		#dim IsGefilterd As %Boolean = ..IsGefilterdAlgemeen(PropertyNaam)		
+		Set:(PropertyNaam="LadeVariant") IsGefilterd = $$$True
+		
+		If ($$$Not(IsGefilterd)) {
+			Do ..GefilterdeProperties.Insert(PropertyNaam)
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkMVXKenmerken">
+<FormalSpec>MVXKenmerken:APPS.PM.Maatwerk.dto.MVXKenmerken</FormalSpec>
+<Implementation><![CDATA[
+	While ..PropertyIterator.HasNext() {
+		#dim PropertyNaam As %String = ..PropertyIterator.Next()
+			
+		#dim IsGefilterd As %Boolean = ..IsGefilterdAlgemeen(PropertyNaam)		
+		
+		If ($$$Not(IsGefilterd)) {
+			Do ..GefilterdeProperties.Insert(PropertyNaam)
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkAlgemeen">
+<FormalSpec>IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	While ..PropertyIterator.HasNext() {
+		#dim PropertyNaam As %String = ..PropertyIterator.Next()
+		
 		continue:PropertyNaam="ExplicietGekozenKenmerken"
 		continue:PropertyNaam="GekoppeldeIngegevenKenmerken"
 		continue:PropertyNaam="Mailer"
@@ -24,12 +92,32 @@
 		continue:PropertyNaam="HeeftDwarsverdeling"
 		continue:PropertyNaam="Omschrijving"
 		continue:PropertyNaam="LegacyKenmerken"
-		continue:PropertyNaam="LadeVariant"
 		
-		Do Gefilterd.Insert(PropertyNaam)
+		Do ..GefilterdeProperties.Insert(PropertyNaam)
 	}
+]]></Implementation>
+</Method>
+
+<Method name="IsGefilterdAlgemeen">
+<FormalSpec>PropertyNaam:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsGefilterd As %Boolean = $$$False
 	
-	Quit ##class(TECH.ListIterator).%New(Gefilterd)
+	Set:(PropertyNaam="ExplicietGekozenKenmerken") IsGefilterd = $$$True
+	Set:(PropertyNaam="GekoppeldeIngegevenKenmerken") IsGefilterd = $$$True
+	Set:(PropertyNaam="Mailer") IsGefilterd = $$$True
+	Set:(PropertyNaam="NietIngegeven") IsGefilterd = $$$True
+	Set:(PropertyNaam="NietMeeleveren") IsGefilterd = $$$True
+	Set:(PropertyNaam="Onderdelen") IsGefilterd = $$$True
+	Set:(PropertyNaam="Validator") IsGefilterd = $$$True
+	Set:(PropertyNaam="VersieNr") IsGefilterd = $$$True
+	Set:((##class(TECH.StringUtils).StartsWith(PropertyNaam, "UitsparingData"))) IsGefilterd = $$$True
+	Set:(PropertyNaam="HeeftDwarsverdeling") IsGefilterd = $$$True
+	Set:(PropertyNaam="Omschrijving") IsGefilterd = $$$True
+	Set:(PropertyNaam="LegacyKenmerken") IsGefilterd = $$$True
+	
+	Quit IsGefilterd
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/IngegevenKenmerkenOptiesGenerator.cls.xml
===================================================================
diff -u -r71887 -r72066
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/IngegevenKenmerkenOptiesGenerator.cls.xml	(.../IngegevenKenmerkenOptiesGenerator.cls.xml)	(revision 71887)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/IngegevenKenmerkenOptiesGenerator.cls.xml	(.../IngegevenKenmerkenOptiesGenerator.cls.xml)	(revision 72066)
@@ -71,10 +71,10 @@
 <Implementation><![CDATA[
 	Set LijstOpties = ##class(%ListOfObjects).%New()
 	
-	Set PropertiesIterator = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GeefProperties(KenmerkenApps.%ClassName(1)))
-	#dim GefilterdePropertiesIterator As TECH.ListIterator = ..ProperyFilter.Filter(PropertiesIterator)
-	
+	#dim GefilterdePropertiesIterator As TECH.ListIterator = ..ProperyFilter.Filter(KenmerkenApps)
+	Do ##class(Tools.Wlip).%New(26).String("Gefilterd")
 	While (GefilterdePropertiesIterator.HasNext()) {
+		Do ##class(Tools.Wlip).%New(26).String("Has next")
 		#dim PropertyNaam As %String = GefilterdePropertiesIterator.Next()
 		#dim Waarde As %String = $Property(KenmerkenApps, PropertyNaam)