Index: AX/Uitgaand/PM/Assortimenten/impl/AssortimentenIterator.cls.xml
===================================================================
diff -u -r41257 -r42532
--- AX/Uitgaand/PM/Assortimenten/impl/AssortimentenIterator.cls.xml	(.../AssortimentenIterator.cls.xml)	(revision 41257)
+++ AX/Uitgaand/PM/Assortimenten/impl/AssortimentenIterator.cls.xml	(.../AssortimentenIterator.cls.xml)	(revision 42532)
@@ -62,7 +62,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%'"
+	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%' AND (NonAktief IS null OR NonAktief = '2')"
 	//Indien selectie nodig is...
 	/*_" and ID in (1432226,1432225,1425096,1425095,682391,1359867,1168696,1168689,830507,1155640,161442,906194,709825,924268,"
 	_"1124771,1038806,1039173,1039208,1247980,353741,353743,353744,254245,254258,1259381,161441,665626,1067709,1067714,268026,"
Index: AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml
===================================================================
diff -u -r41234 -r42532
--- AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml	(.../AankoopPrijzenLevIterator.cls.xml)	(revision 41234)
+++ AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml	(.../AankoopPrijzenLevIterator.cls.xml)	(revision 42532)
@@ -42,7 +42,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%'"
+	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%' AND (NonAktief IS null OR NonAktief = '2')"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
Index: AX/Uitgaand/PM/TMSInventEnabled/impl/TMSInventEnabledIterator.cls.xml
===================================================================
diff -u -r41230 -r42532
--- AX/Uitgaand/PM/TMSInventEnabled/impl/TMSInventEnabledIterator.cls.xml	(.../TMSInventEnabledIterator.cls.xml)	(revision 41230)
+++ AX/Uitgaand/PM/TMSInventEnabled/impl/TMSInventEnabledIterator.cls.xml	(.../TMSInventEnabledIterator.cls.xml)	(revision 42532)
@@ -36,7 +36,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%'"
+	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%' AND (NonAktief IS null OR NonAktief = '2')"
 	/*_" and ID in (1432226,1432225,1425096,1425095,682391,1359867,1168696,1168689,830507,1155640,161442,906194,709825,924268,"
 	_"1124771,1038806,1039173,1039208,1247980,353741,353743,353744,254245,254258,1259381,161441,665626,1067709,1067714,268026,"
 	_"1168369,668615,878186,878220,1169509,1194443,383880,830257)"*/
Index: AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIterator.cls.xml
===================================================================
diff -u -r41167 -r42532
--- AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIterator.cls.xml	(.../VestSpecOrdInstIterator.cls.xml)	(revision 41167)
+++ AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIterator.cls.xml	(.../VestSpecOrdInstIterator.cls.xml)	(revision 42532)
@@ -44,7 +44,7 @@
 <Implementation><![CDATA[
 	#dim SqlTableProdProduct As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName("Prod.Product")
 	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT IdentNummer FROM "_SqlTableProdProduct_" WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%'"
+	Set SqlStatement = "SELECT IdentNummer FROM "_SqlTableProdProduct_" WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%' AND (NonAktief IS null OR NonAktief = '2')"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
Index: AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml
===================================================================
diff -u -r40869 -r42532
--- AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml	(.../ProductIterator.cls.xml)	(revision 40869)
+++ AX/Uitgaand/PM/Product/impl/ProductIterator.cls.xml	(.../ProductIterator.cls.xml)	(revision 42532)
@@ -36,7 +36,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%'"
+	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%' AND (NonAktief IS null OR NonAktief = '2')"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
Index: AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevKortingIterator.cls.xml
===================================================================
diff -u -r41669 -r42532
--- AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevKortingIterator.cls.xml	(.../AankoopPrijzenLevKortingIterator.cls.xml)	(revision 41669)
+++ AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevKortingIterator.cls.xml	(.../AankoopPrijzenLevKortingIterator.cls.xml)	(revision 42532)
@@ -52,7 +52,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%'"
+	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%' AND (NonAktief IS null OR NonAktief = '2')"
 	// Indien nodig is hieronder een filter voorzien om het resultaat te beperken tot overzichtelijk, voor debugging:
 	/*_" and ID in (1175,1988,2865,161441,161442,254245,254258,268026,353741,353743,353744,383880,665626,668615,682391,"
 	_"709825,830257,830507,878186,878220,906194,924268,1038806,1039173,1039208,1067709,1067714,1124771,1155640,1168369,1168689,"