Index: AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemDixfConverter.cls.xml
===================================================================
diff -u -r46267 -r46677
--- AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemDixfConverter.cls.xml	(.../WHSReservationHierarchyItemDixfConverter.cls.xml)	(revision 46267)
+++ AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemDixfConverter.cls.xml	(.../WHSReservationHierarchyItemDixfConverter.cls.xml)	(revision 46677)
@@ -3,79 +3,22 @@
 <Class name="AX.Uitgaand.PM.WHSReservationHierarchyItem.impl.WHSReservationHierarchyItemDixfConverter">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="Vestiging">
-<Type>AXimpl.InterneFirmaInitialen</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="AxProduct">
-<Type>AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Product">
-<Type>AX.Uitgaand.PM.Product.impl.Product</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
-
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="Convert">
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,Vestiging:AXimpl.InterneFirmaInitialen</FormalSpec>
 <ReturnType>AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem</ReturnType>
 <Implementation><![CDATA[
-	Set ..Product = Product
-	
-	If ..Vestiging = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv() {
-		Do ..ConvertVanHoecke()
-	} ElseIf ..Vestiging = ##class(AXimpl.InterneFirmaInitialen).HaluxNv() {
-		Do ..ConvertHalux()
-	} Else {
-		Write !,"Geef als parameter ofwel VHBE, ofwel HLX mee! Huidige parameter is: "_..Vestiging
+	If ($$$Not(Vestiging = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()) && $$$Not(Vestiging = ##class(AXimpl.InterneFirmaInitialen).HaluxNv())) {
+		Write !,"Geef als parameter ofwel VHBE, ofwel HLX mee! Huidige parameter is: "_Vestiging
 	}
 	
-	Quit ..AxProduct
-]]></Implementation>
-</Method>
-
-<Method name="ConvertVanHoecke">
-<Private>1</Private>
-<ReturnType>AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem</ReturnType>
-<Implementation><![CDATA[
 	Set AxProduct = ##class(AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem).%New()
-	Set AxProduct.ItemDataAreaId = "vhbe"
-	Set AxProduct.ItemId = ..Product.Basis.IdentNummer
+	Set AxProduct.ItemDataAreaId = $$$If(Vestiging = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv(),"vhbe","hlx")
+	Set AxProduct.ItemId = Product.Basis.IdentNummer
 	Set AxProduct.ReservationHierarchy = "5637145326"
 	
-	Set ..AxProduct = AxProduct
-	Quit ..AxProduct
+	Quit AxProduct
 ]]></Implementation>
 </Method>
-
-<Method name="ConvertHalux">
-<Private>1</Private>
-<ReturnType>AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem</ReturnType>
-<Implementation><![CDATA[
-	Set AxProduct = ##class(AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem).%New()
-	Set AxProduct.ItemDataAreaId = "hlx"
-	Set AxProduct.ItemId = ..Product.Basis.IdentNummer
-	Set AxProduct.ReservationHierarchy = "5637145326"
-	
-	Set ..AxProduct = AxProduct
-	Quit ..AxProduct
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml
===================================================================
diff -u -r46457 -r46677
--- AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml	(.../WHSReservationHierarchyItemIterator.cls.xml)	(revision 46457)
+++ AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml	(.../WHSReservationHierarchyItemIterator.cls.xml)	(revision 46677)
@@ -48,7 +48,7 @@
 	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)
+	Set ..Converter = ##class(AX.Uitgaand.PM.WHSReservationHierarchyItem.impl.WHSReservationHierarchyItemDixfConverter).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -76,7 +76,7 @@
 <ReturnType>AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem</ReturnType>
 <Implementation><![CDATA[
 	Set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..DynIterator.Next().GetData(1))
-	#dim ConvertedProduct As AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem = ..Converter.Convert(Product)
+	#dim ConvertedProduct As AXdixf.WHSReservationHierarchyItem.WHSReservationHierarchyItem = ..Converter.Convert(Product,..Vestiging)
 	
 	#dim ProductNr As %String = Product.Basis.ProductNr
 	#dim AxEntiteit As %String = "WHSReservationHierarchyItem"