Index: AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevCifDixfConverter.cls.xml
===================================================================
diff -u -r45166 -r45169
--- AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevCifDixfConverter.cls.xml	(.../AankoopPrijzenLevCifDixfConverter.cls.xml)	(revision 45166)
+++ AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevCifDixfConverter.cls.xml	(.../AankoopPrijzenLevCifDixfConverter.cls.xml)	(revision 45169)
@@ -9,11 +9,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="PrimaryVendorId">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="AxProduct">
 <Type>AXdixf.AankoopPrijzenLev.AankoopPrijzenLev</Type>
 <Private>1</Private>
@@ -65,9 +60,9 @@
 <Implementation><![CDATA[
 	Set ..AxProduct = ##class(AXdixf.AankoopPrijzenLev.AankoopPrijzenLev).%New()
 	
-	Do ..BepaalIsBlumProduct(Product)
+	Set ..IsBlumProduct = $$$If(Product.Basis.LeverancierNummer = "5005",$$$True,$$$False)
 	If ..IsBlumProduct {
-		Do ..MaakSoprAxProduct(Product)
+		Set ..SoprAxProduct = ..SoprConvertor.AdminNaarAx(Product.Basis.IdentNrToPRNr(Product.Basis.IdentNummer))
 	}
 	
 	Set ..AxProduct.AccountCode = "Tabel"
@@ -91,8 +86,6 @@
 	Set ..AxProduct.SearchAgain = "1"
 	Set ..AxProduct.ToDate = ""
 	Set ..AxProduct.UnitId = ""
-	
-	Set ..IsBlumProduct = $$$False
 
 	Quit ..AxProduct
 ]]></Implementation>
@@ -103,16 +96,13 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim AccountRelation As %String
-	#dim LeverancierNummer As %String = Product.Basis.LeverancierNummer
+	#dim AccountRelation As %String = ..PrimaryVendorIdBepaler.ConvertPrimaryVendorId(Vestiging,Product)
 	
-	Do ..BepaalPrimaryVendorId(Product,Vestiging)
-	Set AccountRelation = ..PrimaryVendorId
-	
 	If Vestiging = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv() {
 		If ..IsBlumProduct {
-				Set AccountRelation = ..BepaalLeverancierVolgensBlumKunde()
-	}}
+				Set AccountRelation = ..BlumKundeOmzetter.AdminNaarAx(..SoprAxProduct.BlumKunde)
+		}
+	}
 
 	Quit AccountRelation
 ]]></Implementation>
@@ -135,52 +125,6 @@
 	Quit ItemRelation
 ]]></Implementation>
 </Method>
-
-<Method name="BepaalIsBlumProduct">
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim Leverancier As %String = Product.Basis.LeverancierNummer
-	
-	If (Leverancier = "5005") {
-		Set ..IsBlumProduct = $$$True
-	}
-	
-	Quit
-]]></Implementation>
-</Method>
-
-<Method name="MaakSoprAxProduct">
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set ..SoprAxProduct = ..SoprConvertor.AdminNaarAx(Product.Basis.IdentNrToPRNr(Product.Basis.IdentNummer))
-	
-	Quit
-]]></Implementation>
-</Method>
-
-<Method name="BepaalLeverancierVolgensBlumKunde">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim LeverancierVolgensBlumKunde As %String
-	#dim BlumKunde As %String = ..SoprAxProduct.BlumKunde
-	
-	Set LeverancierVolgensBlumKunde = ..BlumKundeOmzetter.AdminNaarAx(BlumKunde)
-	
-	Quit LeverancierVolgensBlumKunde
-]]></Implementation>
-</Method>
-
-<Method name="BepaalPrimaryVendorId">
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,Vestiging:AXimpl.InterneFirmaInitialen</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set ..PrimaryVendorId = ..PrimaryVendorIdBepaler.ConvertPrimaryVendorId(Vestiging,Product)
-	
-	Quit
-]]></Implementation>
-</Method>
 </Class>