Index: AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemDixfGenerator.cls.xml
===================================================================
diff -u -r42800 -r46877
--- AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemDixfGenerator.cls.xml	(.../WHSReservationHierarchyItemDixfGenerator.cls.xml)	(revision 42800)
+++ AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemDixfGenerator.cls.xml	(.../WHSReservationHierarchyItemDixfGenerator.cls.xml)	(revision 46877)
@@ -21,7 +21,7 @@
 		Do StartTimer^vhLib
 		#dim ProductIterator As TECH.Iterator = ##class(AX.Uitgaand.PM.WHSReservationHierarchyItem.impl.WHSReservationHierarchyItemIterator).%New(,Vestiging)
 		do ..Generate(ProductIterator)
-		Write !,"Csv voor migratie 0603 WHSReservationHierarchyItem voor "_Vestiging_" is klaar. Aantal minuten: " 
+		Write !,"Csv voor migratie 0603_"_Vestiging_"_WHSReservationHierarchyItem is klaar. Aantal minuten: " 
 		write $$TimeFromStart^vhLib()/60
 	} Catch {
 		Write ##class(TECH.ExceptionHandler).Catch().ToString()
@@ -40,7 +40,7 @@
 	
 	Set AXProductData.ScheidingsTeken = ";"	
 	Set AXProductData.Iterator = ProductIterator
-	Set AXProductData.BestandVolledigeNaam = ##class(TECH.Files).AppendFile(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_DIXF"),"0603WHSReservationHierarchyItem"_..Vestiging_".csv")
+	Set AXProductData.BestandVolledigeNaam = ##class(TECH.Files).AppendFile(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_DIXF"),"0603_"_..Vestiging_"_WHSReservationHierarchyItem.csv")
 	
 	#dim BestandGenerator As APPS.common.Rapport.impl.BestandGenerator
 	Set BestandGenerator = ##class(APPS.common.Rapport.impl.BestandGenerator).%New()
Index: AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemDixfConverter.cls.xml
===================================================================
diff -u -r46677 -r46877
--- AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemDixfConverter.cls.xml	(.../WHSReservationHierarchyItemDixfConverter.cls.xml)	(revision 46677)
+++ AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemDixfConverter.cls.xml	(.../WHSReservationHierarchyItemDixfConverter.cls.xml)	(revision 46877)
@@ -3,6 +3,29 @@
 <Class name="AX.Uitgaand.PM.WHSReservationHierarchyItem.impl.WHSReservationHierarchyItemDixfConverter">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="GenerischOrgaluxProductFilter">
+<Type>AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductTypeAPIimpl">
+<Type>DOM.PM.impl.ProductTypeAPIimpl</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>GenerischOrgaluxProductFilter:AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter,ProductTypeAPIimpl:DOM.PM.impl.ProductTypeAPIimpl</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..GenerischOrgaluxProductFilter = $$$Inject(GenerischOrgaluxProductFilter,##class(AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New())
+	Set ..ProductTypeAPIimpl = $$$Inject(ProductTypeAPIimpl,##class(DOM.PM.impl.ProductTypeAPIimpl).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Convert">
 <FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,Vestiging:AXimpl.InterneFirmaInitialen</FormalSpec>
 <ReturnType>AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem</ReturnType>
@@ -14,11 +37,22 @@
 	Set AxProduct = ##class(AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem).%New()
 	Set AxProduct.ItemDataAreaId = $$$If(Vestiging = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv(),"vhbe","hlx")
 	Set AxProduct.ItemId = Product.Basis.IdentNummer
-	Set AxProduct.ReservationHierarchy = "5637145326"
+	Set AxProduct.ReservationHierarchy = $$$If(..IsGenerischOfOrgaluxProduct(Product),"5637144578","5637145326")
 	
 	Quit AxProduct
 ]]></Implementation>
 </Method>
+
+<Method name="IsGenerischOfOrgaluxProduct">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductNummer As %String = Product.Basis.ProductNr
+	
+	Quit (..GenerischOrgaluxProductFilter.IsGenerischOrgaluxProduct(Product) || ..ProductTypeAPIimpl.IsGenerischProduct(ProductNummer))
+]]></Implementation>
+</Method>
 </Class>