Index: AXimpl/Admin/DOM/PM/ProductIteratorFilter.cls.xml
===================================================================
diff -u -r48871 -r49334
--- AXimpl/Admin/DOM/PM/ProductIteratorFilter.cls.xml	(.../ProductIteratorFilter.cls.xml)	(revision 48871)
+++ AXimpl/Admin/DOM/PM/ProductIteratorFilter.cls.xml	(.../ProductIteratorFilter.cls.xml)	(revision 49334)
@@ -3,46 +3,26 @@
 <Class name="AXimpl.Admin.DOM.PM.ProductIteratorFilter">
 <Super>TECH.RegisteredObject,TECH.Filter</Super>
 
-<Property name="IsOngewenstProductInMigratieFilter">
-<Type>AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter</Type>
+<Property name="AXProductValidator">
+<Type>AXimpl.common.AxProductValidator</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="SoprIteratorFilter">
-<Type>AX.Uitgaand.PM.impl.SoprIteratorFilter</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..IsOngewenstProductInMigratieFilter = ##class(AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
-	Set ..SoprIteratorFilter = ##class(AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
+	Set ..AXProductValidator = ##class(AXimpl.common.AxProductValidator).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="IsValid">
 <FormalSpec>Item:TECH.ResultSet</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim IsValid As %Boolean = $$$True
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(Item.GetData(1))
-	
-	If $$$Not(..SoprIteratorFilter.IsValid(Product)) {
-		Set IsValid = $$$False
-	} ElseIf (Product.Basis.LinkType = "S") {
-		Set IsValid = $$$False
-	} ElseIf (..IsOngewenstProductInMigratieFilter.IsValid(Product)) {
-		Set IsValid = $$$False
-	} ElseIf (##class(TECH.StringUtils).StartsWith(Product.Basis.IdentNummer,"6")) {
-		Set IsValid = $$$False
-	}
-	
-	Quit IsValid
+<Implementation><![CDATA[	Quit ..AXProductValidator.IsGeldig(Item.GetData(1))
 ]]></Implementation>
 </Method>
 </Class>