Index: AX/Uitgaand/PM/Assortimenten/impl/ProductCategorieFilter.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/PM/Assortimenten/impl/ProductCategorieFilter.cls.xml	(revision 0)
+++ AX/Uitgaand/PM/Assortimenten/impl/ProductCategorieFilter.cls.xml	(revision 47733)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.PM.Assortimenten.impl.ProductCategorieFilter">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="IsOngewenstProductInMigratieFilter">
+<Type>AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter</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()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsValid">
+<FormalSpec>Item:TECH.ResultSet</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(Item.GetData(1))
+	
+	Quit (..SoprIteratorFilter.IsValid(Product) && $$$Not(..IsOngewenstProductInMigratieFilter.IsValid(Product)))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/PM/Assortimenten/impl/ProductCategorieGenerator.cls.xml
===================================================================
diff -u -r47501 -r47733
--- AX/Uitgaand/PM/Assortimenten/impl/ProductCategorieGenerator.cls.xml	(.../ProductCategorieGenerator.cls.xml)	(revision 47501)
+++ AX/Uitgaand/PM/Assortimenten/impl/ProductCategorieGenerator.cls.xml	(.../ProductCategorieGenerator.cls.xml)	(revision 47733)
@@ -38,6 +38,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="DynIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="CategorieBepaler">
 <Type>AX.Uitgaand.PM.Assortimenten.impl.AssortimentCategorieBepaler</Type>
 </Property>
@@ -60,6 +65,8 @@
 	Do ..AxEntiteitLogger.ResetLoggingAxEntiteit(..AxEntiteit, ..Vestiging)
 	Set ..FileWriter = $$$Implementation(FileWriter, ##class(TECH.Context).Instance().GeefFileAPI().GeefFileWriter())
 	Set ..SoprConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set Filter = ##class(AX.Uitgaand.PM.Assortimenten.impl.ProductCategorieFilter).%New()
+	Set ..DynIterator = ##class(TECH.DynamicIterator).%New(..ProductIterator(),,Filter)
  	Set ..CategorieBepaler=##class(AX.Uitgaand.PM.Assortimenten.impl.AssortimentCategorieBepaler).%New()
 	Quit $$$OK
 ]]></Implementation>
@@ -76,7 +83,7 @@
 	
 	Do ..MaakHeaders()
 	
-	Set itProduct=..ProductIterator()
+	Set itProduct=..DynIterator
 	While itProduct.HasNext() {
 		Set rs=itProduct.Next()
 		Set PRNr=rs.Data("ID")
@@ -96,7 +103,7 @@
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
 	Set rs=##class(TECH.ResultSet).%New()
-	Do rs.Prepare("SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2') AND ID NOT IN (797700,1102922,1156079,785609,769387,830298,865318,865317,865329,865330,865327,1793108) UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796'")
+	Do rs.Prepare("SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2') UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796'")
  	Do rs.Execute()
 	Set it=##class(TECH.ResultSetIterator).%New(rs)
 	Quit it