Index: vhUnitTest/AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfConverter/Test.cls.xml
===================================================================
diff -u -r41406 -r42639
--- vhUnitTest/AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 41406)
+++ vhUnitTest/AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 42639)
@@ -3,129 +3,145 @@
 <Class name="vhUnitTest.AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: Zijn alle defaults goed voor Van Hoecke">
+<Parameter name="ProductId">
+<Type>%String</Type>
+<Default>1000</Default>
+</Parameter>
+
+<Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
-	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
-	#dim Vestiging As %String = "VanHoecke"
-	#dim LeverancierNummer As %String = "6332"
-	#dim TestProduct As AXdixf.AankoopPrijzenLev.AankoopPrijzenLev = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter).%New(Vestiging,LeverancierNummer).ConvertVanHoecke(AxProduct)
-	
-	Do $$$AssertEquals(TestProduct.AccountCode ,"Tabel")
-	Do $$$AssertEquals(TestProduct.Currency  ,"EUR")
-	Do $$$AssertEquals(TestProduct.FromDate  ,"01/01/2017")
-	Do $$$AssertEquals(TestProduct.InventDimId  ,"AllBlank")
-	Do $$$AssertEquals(TestProduct.ItemCode  ,"Tabel")
-	Do $$$AssertEquals(TestProduct.JournalName  ,"HOJ")
-	Do $$$AssertEquals(TestProduct.JournalNum  ,"00000001")
-	Do $$$AssertEquals(TestProduct.Module  ,"Leverancier")
-	Do $$$AssertEquals(TestProduct.Percent1  ,"")
-	Do $$$AssertEquals(TestProduct.Percent2  ,"")
-	Do $$$AssertEquals(TestProduct.QuantityAmountFrom  ,"")
-	Do $$$AssertEquals(TestProduct.QuantityAmountTo  ,"")
-	Do $$$AssertEquals(TestProduct.relation  ,"Prijs (inkoop)")
-	Do $$$AssertEquals(TestProduct.SearchAgain  ,"1")
-	Do $$$AssertEquals(TestProduct.ToDate  ,"")
-	Do $$$AssertEquals(TestProduct.UnitId  ,"STK")
+ 	Do ##super()
+ 	Do ##class(vhTest.Utils.DOM.PM.Product).CreeerProduct(..#ProductId)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Zijn alle defaults goed voor Halux">
+<Method name="OnAfterAllTests">
 <Implementation><![CDATA[
-	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
-	#dim Vestiging As %String = "Halux"
-	#dim LeverancierNummer As %String = "5497"
-	#dim TestProduct As AXdixf.AankoopPrijzenLev.AankoopPrijzenLev = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter).%New(Vestiging,LeverancierNummer).ConvertHalux(AxProduct)
+ 	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
+ 	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Zijn alle gemeenschappelijke defaults goed">
+<Implementation><![CDATA[
+	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
+	do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6332)
 	
-	Do $$$AssertEquals(TestProduct.AccountCode ,"Tabel")
-	Do $$$AssertEquals(TestProduct.Currency  ,"EUR")
-	Do $$$AssertEquals(TestProduct.FromDate  ,"01/01/2017")
-	Do $$$AssertEquals(TestProduct.InventDimId  ,"AllBlank")
-	Do $$$AssertEquals(TestProduct.ItemCode  ,"Tabel")
-	Do $$$AssertEquals(TestProduct.JournalName  ,"HOJ")
-	Do $$$AssertEquals(TestProduct.JournalNum  ,"00000001")
-	Do $$$AssertEquals(TestProduct.Module  ,"Leverancier")
-	Do $$$AssertEquals(TestProduct.Percent1  ,"")
-	Do $$$AssertEquals(TestProduct.Percent2  ,"")
-	Do $$$AssertEquals(TestProduct.QuantityAmountFrom  ,"")
-	Do $$$AssertEquals(TestProduct.QuantityAmountTo  ,"")
-	Do $$$AssertEquals(TestProduct.relation  ,"Prijs (inkoop)")
-	Do $$$AssertEquals(TestProduct.SearchAgain  ,"1")
-	Do $$$AssertEquals(TestProduct.ToDate  ,"")
-	Do $$$AssertEquals(TestProduct.UnitId  ,"STK")
+	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()
+	
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterProduct()
+	
+	#dim Converter As AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter = ..GeefConverter()
+	
+	#dim ConvertedProduct As AXdixf.VrijgegProduct.VrijgegProduct = Converter.Convert(AxProduct,"1",Firma)
+	
+	Do $$$AssertEquals(ConvertedProduct.AccountCode ,"Tabel")
+	Do $$$AssertEquals(ConvertedProduct.Currency  ,"EUR")
+	Do $$$AssertEquals(ConvertedProduct.FromDate  ,"01/01/2017")
+	Do $$$AssertEquals(ConvertedProduct.InventDimId  ,"AllBlank")
+	Do $$$AssertEquals(ConvertedProduct.ItemCode  ,"Tabel")
+	Do $$$AssertEquals(ConvertedProduct.JournalName  ,"HOJ")
+	Do $$$AssertEquals(ConvertedProduct.JournalNum  ,"00000001")
+	Do $$$AssertEquals(ConvertedProduct.Module  ,"Leverancier")
+	Do $$$AssertEquals(ConvertedProduct.Percent1  ,"")
+	Do $$$AssertEquals(ConvertedProduct.Percent2  ,"")
+	Do $$$AssertEquals(ConvertedProduct.QuantityAmountFrom  ,"")
+	Do $$$AssertEquals(ConvertedProduct.QuantityAmountTo  ,"")
+	Do $$$AssertEquals(ConvertedProduct.relation  ,"Prijs (inkoop)")
+	Do $$$AssertEquals(ConvertedProduct.SearchAgain  ,"1")
+	Do $$$AssertEquals(ConvertedProduct.ToDate  ,"")
+	Do $$$AssertEquals(ConvertedProduct.UnitId  ,"STK")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Als GrootteOrde &apos;E&apos; is dan moet PriceUnit &apos;1&apos; zijn">
 <Implementation><![CDATA[
-	#dim TestProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
-	#dim Vestiging As %String = "VanHoecke"
-	#dim LeverancierNummer As %String = "6332"
+	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
+	do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6332)
 	
-	Set TestProduct.Prijs.GrootteOrde = "E"
-
+	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()
 	
-	#dim PriceUnit  As %String = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter).%New(Vestiging,LeverancierNummer).BepaalPriceUnit(TestProduct)
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterProduct()
+	Set AxProduct.Prijs.GrootteOrde = "E"
 	
-	Do $$$AssertEquals(PriceUnit ,"1")
-	Do $$$AssertNotEquals(PriceUnit ,"100")
-	Do $$$AssertNotEquals(PriceUnit ,"1000")
-	Do $$$AssertNotEquals(PriceUnit ,"")
+	#dim Converter As AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter = ..GeefConverter()
+	
+	#dim ConvertedProduct As AXdixf.VrijgegProduct.VrijgegProduct = Converter.Convert(AxProduct,"1",Firma)
+	
+	Do $$$AssertEquals(ConvertedProduct.PriceUnit ,"1")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Als GrootteOrde &apos;H&apos; is dan moet PriceUnit &apos;100&apos; zijn">
 <Implementation><![CDATA[
-	#dim TestProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
-	#dim Vestiging As %String = "VanHoecke"
-	#dim LeverancierNummer As %String = "6332"
+	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
+	do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6332)
 	
-	Set TestProduct.Prijs.GrootteOrde = "H"
-
+	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()
 	
-	#dim PriceUnit  As %String = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter).%New(Vestiging,LeverancierNummer).BepaalPriceUnit(TestProduct)
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterProduct()
+	Set AxProduct.Prijs.GrootteOrde = "H"
 	
-	Do $$$AssertEquals(PriceUnit ,"100")
-	Do $$$AssertNotEquals(PriceUnit ,"1")
-	Do $$$AssertNotEquals(PriceUnit ,"1000")
-	Do $$$AssertNotEquals(PriceUnit ,"")
+	#dim Converter As AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter = ..GeefConverter()
+	
+	#dim ConvertedProduct As AXdixf.VrijgegProduct.VrijgegProduct = Converter.Convert(AxProduct,"1",Firma)
+	
+	Do $$$AssertEquals(ConvertedProduct.PriceUnit ,"100")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Als GrootteOrde &apos;M&apos; is dan moet PriceUnit &apos;1000&apos; zijn">
 <Implementation><![CDATA[
-	#dim TestProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
-	#dim Vestiging As %String = "VanHoecke"
-	#dim LeverancierNummer As %String = "6332"
+	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
+	do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6332)
 	
-	Set TestProduct.Prijs.GrootteOrde = "M"
-
+	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()
 	
-	#dim PriceUnit  As %String = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter).%New(Vestiging,LeverancierNummer).BepaalPriceUnit(TestProduct)
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterProduct()
+	Set AxProduct.Prijs.GrootteOrde = "M"
 	
-	Do $$$AssertEquals(PriceUnit ,"1000")
-	Do $$$AssertNotEquals(PriceUnit ,"1")
-	Do $$$AssertNotEquals(PriceUnit ,"100")
-	Do $$$AssertNotEquals(PriceUnit ,"")
+	#dim Converter As AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter = ..GeefConverter()
+	
+	#dim ConvertedProduct As AXdixf.VrijgegProduct.VrijgegProduct = Converter.Convert(AxProduct,"1",Firma)
+	
+	Do $$$AssertEquals(ConvertedProduct.PriceUnit ,"1000")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Als GrootteOrde leeg is dan moet PriceUnit leeg zijn">
 <Implementation><![CDATA[
-	#dim TestProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
-	#dim Vestiging As %String = "VanHoecke"
-	#dim LeverancierNummer As %String = "6332"
-
-	Set TestProduct.Prijs.GrootteOrde = ""
-
+	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
+	do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6332)
 	
-	#dim PriceUnit  As %String = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter).%New(Vestiging,LeverancierNummer).BepaalPriceUnit(TestProduct)
+	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()
 	
-	Do $$$AssertEquals(PriceUnit ,"")
-	Do $$$AssertNotEquals(PriceUnit ,"1")
-	Do $$$AssertNotEquals(PriceUnit ,"100")
-	Do $$$AssertNotEquals(PriceUnit ,"1000")
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterProduct()
+	Set AxProduct.Prijs.GrootteOrde = ""
+	
+	#dim Converter As AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter = ..GeefConverter()
+	
+	#dim ConvertedProduct As AXdixf.VrijgegProduct.VrijgegProduct = Converter.Convert(AxProduct,"1",Firma)
+
+	Do $$$AssertEquals(ConvertedProduct.PriceUnit ,"")
 ]]></Implementation>
 </Method>
+
+<Method name="GeefTeConverterProduct">
+<Private>1</Private>
+<ReturnType>AX.Uitgaand.PM.Product.impl.Product</ReturnType>
+<Implementation><![CDATA[
+	Set AxProduct = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	do AxProduct.BasisSetObjectId(..#ProductId)
+	quit AxProduct
+]]></Implementation>
+</Method>
+
+<Method name="GeefConverter">
+<Private>1</Private>
+<ReturnType>AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter</ReturnType>
+<Implementation><![CDATA[	quit ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter).%New()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml
===================================================================
diff -u -r42616 -r42639
--- AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml	(.../AankoopPrijzenLevIterator.cls.xml)	(revision 42616)
+++ AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml	(.../AankoopPrijzenLevIterator.cls.xml)	(revision 42639)
@@ -3,6 +3,16 @@
 <Class name="AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevIterator">
 <Super>TECH.RegisteredObject,TECH.Iterator</Super>
 
+<Property name="LineNum">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Vestiging">
+<Type>AXimpl.InterneFirmaInitialen</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="DynIterator">
 <Type>TECH.Iterator</Type>
 <Private>1</Private>
@@ -18,29 +28,25 @@
 <Private>1</Private>
 </Property>
 
-<Property name="LineNum">
-<Type>%Integer</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="Converter">
 <Type>AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>QueryAPI:TECH.Query.QueryAPI="",Vestiging:%String</FormalSpec>
+<FormalSpec>QueryAPI:TECH.Query.QueryAPI="",Vestiging:AXimpl.InterneFirmaInitialen</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
+	Set ..Vestiging = Vestiging
 	Do ..VoerUitQuery()
 	Set Filter = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevIteratorFilter).%New()
 	Set ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
 	Set ..DynIterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator,,Filter)
-	Set ..Converter = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter).%New(Vestiging)
+	Set ..Converter = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter).%New()
 	Set ..LineNum = 0
 	Quit $$$OK
 ]]></Implementation>
@@ -66,7 +72,7 @@
 <Implementation><![CDATA[
 	Set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..DynIterator.Next().GetData(1))
 	Set ..LineNum = ..LineNum + 1
-	#dim ConvertedProduct As AXdixf.AankoopPrijzenLev.AankoopPrijzenLev = ..Converter.Convert(Product,..LineNum)
+	#dim ConvertedProduct As AXdixf.AankoopPrijzenLev.AankoopPrijzenLev = ..Converter.Convert(Product,..LineNum, ..Vestiging)
 	
 	Quit ConvertedProduct
 ]]></Implementation>
Index: AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfGenerator.cls.xml
===================================================================
diff -u -r41671 -r42639
--- AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfGenerator.cls.xml	(.../AankoopPrijzenLevDixfGenerator.cls.xml)	(revision 41671)
+++ AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfGenerator.cls.xml	(.../AankoopPrijzenLevDixfGenerator.cls.xml)	(revision 42639)
@@ -9,18 +9,20 @@
 </Property>
 
 <Property name="Vestiging">
-<Type>%String</Type>
+<Type>AXimpl.InterneFirmaInitialen</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="GenerateAll">
-<FormalSpec>Vestiging:%String</FormalSpec>
+<FormalSpec>Vestiging:AXimpl.InterneFirmaInitialen</FormalSpec>
 <Implementation><![CDATA[
+	Do StartTimer^vhLib
 	Set ..Vestiging = Vestiging
 	Try {
 		#dim ProductIterator As TECH.Iterator = ##class(AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevIterator).%New(,Vestiging)
 		do ..Generate(ProductIterator)
-		Write !,"Klaar"
+		Write !,"Csv voor migratie 0606 AankoopPrijzenLev voor "_Vestiging_" is klaar. Aantal minuten: "
+		write $$TimeFromStart^vhLib()/60
 	} Catch {
 		Write ##class(TECH.ExceptionHandler).Catch().ToString()
 	}
Index: AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfConverter.cls.xml
===================================================================
diff -u -r42587 -r42639
--- AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfConverter.cls.xml	(.../AankoopPrijzenLevDixfConverter.cls.xml)	(revision 42587)
+++ AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfConverter.cls.xml	(.../AankoopPrijzenLevDixfConverter.cls.xml)	(revision 42639)
@@ -3,139 +3,103 @@
 <Class name="AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="Vestiging">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="AxProduct">
 <Type>AXdixf.AankoopPrijzenLev.AankoopPrijzenLev</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="LeverancierNummer">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="LineNum">
 <Type>%String</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Vestiging:%String,LeverancierNummer:%String=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	Set ..Vestiging = Vestiging
-	Set ..LeverancierNummer = LeverancierNummer
-	Quit $$$OK
+<Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLeverancierNummer">
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	Set:(..LeverancierNummer = "") ..LeverancierNummer = Product.Basis.LeverancierNummer
-	Quit ..LeverancierNummer
-]]></Implementation>
-</Method>
-
 <Method name="Convert">
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,LineNum:%String</FormalSpec>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,LineNum:%String,Vestiging:AXimpl.InterneFirmaInitialen</FormalSpec>
 <ReturnType>AXdixf.AankoopPrijzenLev.AankoopPrijzenLev</ReturnType>
 <Implementation><![CDATA[
 	Set ..LineNum = LineNum
-	If ..Vestiging = "VanHoecke" {
+	Set ..AxProduct = ##class(AXdixf.AankoopPrijzenLev.AankoopPrijzenLev).%New()
+	
+	Do ..ConvertGemeenschappelijk(Product)
+	
+	If Vestiging = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv() {
 		Do ..ConvertVanHoecke(Product)
-	}
-	Else {
-		If ..Vestiging = "Halux" {
+	} ElseIf Vestiging = ##class(AXimpl.InterneFirmaInitialen).HaluxNv() {
 			Do ..ConvertHalux(Product)
-		}
-		Else {
-			Write !,"Geef als parameter ofwel VanHoecke, ofwel Halux mee!"
-		}
+		} Else {
+			Write !,"Geef als parameter ofwel VHBE, ofwel HLX mee! Huidige parameter is: "_Vestiging
 	}
-	Set ..LeverancierNummer = ""
+
 	Quit ..AxProduct
 ]]></Implementation>
 </Method>
 
+<Method name="ConvertGemeenschappelijk">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXdixf.AankoopPrijzenLev.AankoopPrijzenLev</ReturnType>
+<Implementation><![CDATA[
+	Set ..AxProduct.AccountCode = "Tabel"
+	Set ..AxProduct.Amount = ..BepaalAmount(Product)
+	Set ..AxProduct.Currency = "EUR"
+	Set ..AxProduct.FromDate = "01/01/2017"
+	Set ..AxProduct.InventDimId = "AllBlank"
+	Set ..AxProduct.ItemCode = "Tabel"
+	Set ..AxProduct.ItemRelation = Product.Basis.IdentNummer
+	Set ..AxProduct.JournalName = "HOJ"
+	Set ..AxProduct.JournalNum = "00000001"
+	Set ..AxProduct.LineNum = ..LineNum
+	Set ..AxProduct.Module = "Leverancier"
+	Set ..AxProduct.Percent1 = ""
+	Set ..AxProduct.Percent2 = ""
+	Set ..AxProduct.PriceUnit = ..BepaalPriceUnit(Product)
+	Set ..AxProduct.QuantityAmountFrom = ""
+	Set ..AxProduct.QuantityAmountTo = ""
+	Set ..AxProduct.relation = "Prijs (inkoop)"
+	Set ..AxProduct.SearchAgain = "1"
+	Set ..AxProduct.ToDate = ""
+	Set ..AxProduct.UnitId = "STK"
+]]></Implementation>
+</Method>
+
 <Method name="ConvertVanHoecke">
 <FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<Private>1</Private>
 <ReturnType>AXdixf.AankoopPrijzenLev.AankoopPrijzenLev</ReturnType>
 <Implementation><![CDATA[
-	Set AxProduct = ##class(AXdixf.AankoopPrijzenLev.AankoopPrijzenLev).%New()
-	Set AxProduct.AccountCode = "Tabel"
-	Set AxProduct.AccountRelation = ..BepaalAccountRelationVH(Product)
-	Set AxProduct.Amount = ..BepaalAmount(Product)
-	Set AxProduct.Currency = "EUR"
-	Set AxProduct.FromDate = "01/01/2017"
-	Set AxProduct.InventDimId = "AllBlank"
-	Set AxProduct.ItemCode = "Tabel"
-	Set AxProduct.ItemRelation = Product.Basis.IdentNummer
-	Set AxProduct.JournalName = "HOJ"
-	Set AxProduct.JournalNum = "00000001"
-	Set AxProduct.LineNum = ..LineNum
-	Set AxProduct.Module = "Leverancier"
-	Set AxProduct.Percent1 = ""
-	Set AxProduct.Percent2 = ""
-	Set AxProduct.PriceUnit = ..BepaalPriceUnit(Product)
-	Set AxProduct.QuantityAmountFrom = ""
-	Set AxProduct.QuantityAmountTo = ""
-	Set AxProduct.relation = "Prijs (inkoop)"
-	Set AxProduct.SearchAgain = "1"
-	Set AxProduct.ToDate = ""
-	Set AxProduct.UnitId = "STK"
+	Set ..AxProduct.AccountRelation = ..BepaalAccountRelationVH(Product)
 
-	Set ..AxProduct = AxProduct
 	Quit ..AxProduct
 ]]></Implementation>
 </Method>
 
 <Method name="ConvertHalux">
 <FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<Private>1</Private>
 <ReturnType>AXdixf.AankoopPrijzenLev.AankoopPrijzenLev</ReturnType>
 <Implementation><![CDATA[
-	Set AxProduct = ##class(AXdixf.AankoopPrijzenLev.AankoopPrijzenLev).%New()
-	Set AxProduct.AccountCode = "Tabel"
-	Set AxProduct.AccountRelation = ..BepaalAccountRelationHLX(Product)
-	Set AxProduct.Amount = ..BepaalAmount(Product)
-	Set AxProduct.Currency = "EUR"
-	Set AxProduct.FromDate = "01/01/2017"
-	Set AxProduct.InventDimId = "AllBlank"
-	Set AxProduct.ItemCode = "Tabel"
-	Set AxProduct.ItemRelation = Product.Basis.IdentNummer
-	Set AxProduct.JournalName = "HOJ"
-	Set AxProduct.JournalNum = "00000001"
-	Set AxProduct.LineNum = ..LineNum
-	Set AxProduct.Module = "Leverancier"
-	Set AxProduct.Percent1 = ""
-	Set AxProduct.Percent2 = ""
-	Set AxProduct.PriceUnit = ..BepaalPriceUnit(Product)
-	Set AxProduct.QuantityAmountFrom = ""
-	Set AxProduct.QuantityAmountTo = ""
-	Set AxProduct.relation = "Prijs (inkoop)"
-	Set AxProduct.SearchAgain = "1"
-	Set AxProduct.ToDate = ""
-	Set AxProduct.UnitId = "STK"
+	Set ..AxProduct.AccountRelation = ..BepaalAccountRelationHLX(Product)
 
-	Set ..AxProduct = AxProduct
 	Quit ..AxProduct
 ]]></Implementation>
 </Method>
 
 <Method name="BepaalAccountRelationVH">
 <FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim AccountRelationVH As %String
-	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
+	#dim LeverancierNummer As %String = Product.Basis.LeverancierNummer
 	
 	Set AccountRelationVH = ##class(TECH.StringUtils).AddLeadingChar(LeverancierNummer,"0",5)
 
@@ -145,10 +109,11 @@
 
 <Method name="BepaalAccountRelationHLX">
 <FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim AccountRelationHLX As %String
-	#dim LeverancierNummer As %String = ..GeefLeverancierNummer(Product)
+	#dim LeverancierNummer As %String = Product.Basis.LeverancierNummer
 	
 	Set LeverancierNummer = ##class(AX.Uitgaand.PM.impl.Convertor.ConvertorLeveranciersnummerVanHoeckeNaarHalux).%New().ConvertorLeveranciersnummerVanHoeckeNaarHalux(LeverancierNummer)
 	Set AccountRelationHLX = ##class(TECH.StringUtils).AddLeadingChar(LeverancierNummer,"0",5)
@@ -159,6 +124,7 @@
 
 <Method name="BepaalAmount">
 <FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim Amount As %String
@@ -173,6 +139,7 @@
 
 <Method name="BepaalPriceUnit">
 <FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim PriceUnit As %String