Index: AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIteratorFilter.cls.xml
===================================================================
diff -u -r43027 -r46438
--- AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIteratorFilter.cls.xml	(.../WHSReservationHierarchyItemIteratorFilter.cls.xml)	(revision 43027)
+++ AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIteratorFilter.cls.xml	(.../WHSReservationHierarchyItemIteratorFilter.cls.xml)	(revision 46438)
@@ -3,18 +3,31 @@
 <Class name="AX.Uitgaand.PM.WHSReservationHierarchyItem.impl.WHSReservationHierarchyItemIteratorFilter">
 <Super>TECH.RegisteredObject,TECH.Filter</Super>
 
+<Property name="IsOrgaluxProductFilter">
+<Type>AX.Uitgaand.PM.impl.IsOrgaluxProductFilter</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="SoprIteratorFilter">
 <Type>AX.Uitgaand.PM.impl.SoprIteratorFilter</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="Vestiging">
+<Type>AXimpl.InterneFirmaInitialen</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
+<FormalSpec>Vestiging:AXimpl.InterneFirmaInitialen</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..Vestiging = Vestiging
 	Set ..SoprIteratorFilter = ##class(AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
+	Set ..IsOrgaluxProductFilter = ##class(AX.Uitgaand.PM.impl.IsOrgaluxProductFilter).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -23,9 +36,18 @@
 <FormalSpec>Item:TECH.ResultSet</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	#dim IsValid As %Boolean = $$$False
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(Item.GetData(1))
 	
-	Quit ..SoprIteratorFilter.IsValid(Product)
+	If ..SoprIteratorFilter.IsValid(Product) {
+		Set IsValid = $$$True
+	}
+	
+	If ((..Vestiging = ##class(AXimpl.InterneFirmaInitialen).HaluxNv()) && ..IsOrgaluxProductFilter.IsValid(Product)) {
+		Set IsValid = $$$False
+	}
+	
+	Quit IsValid
 ]]></Implementation>
 </Method>
 </Class>
Index: AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml
===================================================================
diff -u -r46267 -r46438
--- AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml	(.../WHSReservationHierarchyItemIterator.cls.xml)	(revision 46267)
+++ AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml	(.../WHSReservationHierarchyItemIterator.cls.xml)	(revision 46438)
@@ -45,7 +45,7 @@
 	Set ..Vestiging = Vestiging
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
 	Do ..VoerUitQuery()
-	Set Filter = ##class(AX.Uitgaand.PM.WHSReservationHierarchyItem.impl.WHSReservationHierarchyItemIteratorFilter).%New()
+	Set Filter = ##class(AX.Uitgaand.PM.WHSReservationHierarchyItem.impl.WHSReservationHierarchyItemIteratorFilter).%New(Vestiging)
 	Set ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
 	Set ..DynIterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator,,Filter)
 	Set ..Converter = ##class(AX.Uitgaand.PM.WHSReservationHierarchyItem.impl.WHSReservationHierarchyItemDixfConverter).%New(Vestiging)