Index: AX/Uitgaand/PM/PakketReferenties/impl/PakketReferentiesIteratorFilter.cls.xml
===================================================================
diff -u -r48035 -r48057
--- AX/Uitgaand/PM/PakketReferenties/impl/PakketReferentiesIteratorFilter.cls.xml	(.../PakketReferentiesIteratorFilter.cls.xml)	(revision 48035)
+++ AX/Uitgaand/PM/PakketReferenties/impl/PakketReferentiesIteratorFilter.cls.xml	(.../PakketReferentiesIteratorFilter.cls.xml)	(revision 48057)
@@ -3,17 +3,82 @@
 <Class name="AX.Uitgaand.PM.PakketReferenties.impl.PakketReferentiesIteratorFilter">
 <Super>TECH.RegisteredObject,TECH.Filter</Super>
 
+<Property name="QueryAPI">
+<Type>TECH.Query.QueryAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResultSet">
+<Type>TECH.ResultSet</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResultSetIterator">
+<Type>TECH.ResultSetIterator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>QueryAPI:TECH.Query.QueryAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="IsValid">
 <FormalSpec>Item:TECH.ResultSet</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set PakketOnderdeel = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(,Item.GetData(1))
 	#dim Pakket As DOM.PM.impl.DataM.Pakket = PakketOnderdeel.PakketOnderdeel.Pakket
+	#dim PakketNummer As %String = Pakket.PakketNummer
 	#dim PakketNaam As %String = Pakket.Naam
 	#dim KlantNr As %String = Pakket.KlantNr
-	Quit ($$$Not(##class(TECH.StringUtils).Contains(PakketNaam," Oud","VERVALT")) && $$$Not(KlantNr = "0"))
+	#dim NietActief As %Boolean = ..HeeftNonActiefProduct(PakketNummer)
+	
+	Quit ($$$Not(##class(TECH.StringUtils).Contains(PakketNaam," Oud","VERVALT")) && $$$Not(KlantNr = "0") && $$$Not(NietActief))
 ]]></Implementation>
 </Method>
+
+<Method name="HeeftNonActiefProduct">
+<FormalSpec>PakketNummer:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim HeeftNonActiefProduct As %Boolean = $$$False
+	Do ..VoerUitQuery(PakketNummer)
+	Set ..ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
+	
+	While (..ResultSetIterator.HasNext()) {
+		Set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..ResultSetIterator.Next().GetData(2))
+		If (Product.Basis.NONAktief = "1") {
+			Set HeeftNonActiefProduct = $$$True
+			Quit
+		}
+	}
+	If HeeftNonActiefProduct {
+		w !,"HeeftNonActiefProduct = '"_HeeftNonActiefProduct_"'"
+	}
+	Quit HeeftNonActiefProduct
+]]></Implementation>
+</Method>
+
+<Method name="VoerUitQuery">
+<FormalSpec>PakketNummer:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim SqlStatement as %String
+	Set SqlStatement = "SELECT ID, Product FROM DOM_PM_impl_DataM.PakketOnderdeel "
+	_"WHERE Pakket IN (SELECT Pakket FROM DOM_PM_impl_DataM.PakketOnderdeel "
+	_"WHERE Pakket = '"_PakketNummer_"' GROUP BY Pakket)"
+	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
+]]></Implementation>
+</Method>
 </Class>