Index: AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfConverter.cls.xml
===================================================================
diff -u -r42639 -r42650
--- AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfConverter.cls.xml	(.../AankoopPrijzenLevDixfConverter.cls.xml)	(revision 42639)
+++ AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevDixfConverter.cls.xml	(.../AankoopPrijzenLevDixfConverter.cls.xml)	(revision 42650)
@@ -3,8 +3,9 @@
 <Class name="AX.Uitgaand.PM.AankoopPrijzenLev.impl.AankoopPrijzenLevDixfConverter">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="AxProduct">
-<Type>AXdixf.AankoopPrijzenLev.AankoopPrijzenLev</Type>
+<Property name="IsBlumProduct">
+<Type>%Boolean</Type>
+<InitialExpression>$$$False</InitialExpression>
 <Private>1</Private>
 </Property>
 
@@ -13,12 +14,42 @@
 <Private>1</Private>
 </Property>
 
+<Property name="AxProduct">
+<Type>AXdixf.AankoopPrijzenLev.AankoopPrijzenLev</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BlumKundeOmzetter">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.BlumKunde</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ConvertorLeveranciersnummerVanHoeckeNaarHalux">
+<Type>AX.Uitgaand.PM.impl.Convertor.ConvertorLeveranciersnummerVanHoeckeNaarHalux</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SoprAxProduct">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SoprConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[	Quit $$$OK
+<Implementation><![CDATA[
+	Set ..BlumKundeOmzetter = ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.BlumKunde).%New()
+	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ##class(AX.Uitgaand.PM.impl.Convertor.ConvertorLeveranciersnummerVanHoeckeNaarHalux).%New()
+	Set ..SoprConvertor = ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
@@ -29,32 +60,39 @@
 	Set ..LineNum = LineNum
 	Set ..AxProduct = ##class(AXdixf.AankoopPrijzenLev.AankoopPrijzenLev).%New()
 	
-	Do ..ConvertGemeenschappelijk(Product)
+	Do ..BepaalIsBlumProduct(Product)
+	If ..IsBlumProduct {
+		Do ..MaakSoprAxProduct(Product)
+	}
 	
+	Do ..ConvertGemeenschappelijk(Product,Vestiging)
+	
 	If Vestiging = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv() {
 		Do ..ConvertVanHoecke(Product)
 	} ElseIf Vestiging = ##class(AXimpl.InterneFirmaInitialen).HaluxNv() {
 			Do ..ConvertHalux(Product)
 		} Else {
 			Write !,"Geef als parameter ofwel VHBE, ofwel HLX mee! Huidige parameter is: "_Vestiging
 	}
+	
+	Set ..IsBlumProduct = $$$False
 
 	Quit ..AxProduct
 ]]></Implementation>
 </Method>
 
 <Method name="ConvertGemeenschappelijk">
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,Vestiging:AXimpl.InterneFirmaInitialen</FormalSpec>
 <Private>1</Private>
-<ReturnType>AXdixf.AankoopPrijzenLev.AankoopPrijzenLev</ReturnType>
 <Implementation><![CDATA[
 	Set ..AxProduct.AccountCode = "Tabel"
+	Set ..AxProduct.AccountRelation = ..BepaalAccountRelation(Product,Vestiging)
 	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.ItemRelation = ..BepaalItemRelation(Product)
 	Set ..AxProduct.JournalName = "HOJ"
 	Set ..AxProduct.JournalNum = "00000001"
 	Set ..AxProduct.LineNum = ..LineNum
@@ -74,66 +112,66 @@
 <Method name="ConvertVanHoecke">
 <FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <Private>1</Private>
-<ReturnType>AXdixf.AankoopPrijzenLev.AankoopPrijzenLev</ReturnType>
-<Implementation><![CDATA[
-	Set ..AxProduct.AccountRelation = ..BepaalAccountRelationVH(Product)
-
-	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.AccountRelation = ..BepaalAccountRelationHLX(Product)
-
-	Quit ..AxProduct
-]]></Implementation>
 </Method>
 
-<Method name="BepaalAccountRelationVH">
-<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<Method name="BepaalAccountRelation">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,Vestiging:AXimpl.InterneFirmaInitialen</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim AccountRelationVH As %String
+	#dim AccountRelation As %String
 	#dim LeverancierNummer As %String = Product.Basis.LeverancierNummer
 	
-	Set AccountRelationVH = ##class(TECH.StringUtils).AddLeadingChar(LeverancierNummer,"0",5)
+	If Vestiging = ##class(AXimpl.InterneFirmaInitialen).HaluxNv() {
+		Set LeverancierNummer = ..ConvertorLeveranciersnummerVanHoeckeNaarHalux.ConvertorLeveranciersnummerVanHoeckeNaarHalux(LeverancierNummer)
+	}
+	
+	Set AccountRelation = ##class(TECH.StringUtils).AddLeadingChar(LeverancierNummer,"0",5)
+	
+	If ..IsBlumProduct {
+		If (..SoprAxProduct.HeeftVervangSoprPRNr = $$$True) {
+			Set AccountRelation = ..BepaalLeverancierVolgensBlumKunde()
+	}}
 
-	Quit AccountRelationVH
+	Quit AccountRelation
 ]]></Implementation>
 </Method>
 
-<Method name="BepaalAccountRelationHLX">
+<Method name="BepaalAmount">
 <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 = Product.Basis.LeverancierNummer
+	#dim Amount As %String
+	#dim PPL As %String = Product.Prijs.PPL
 	
-	Set LeverancierNummer = ##class(AX.Uitgaand.PM.impl.Convertor.ConvertorLeveranciersnummerVanHoeckeNaarHalux).%New().ConvertorLeveranciersnummerVanHoeckeNaarHalux(LeverancierNummer)
-	Set AccountRelationHLX = ##class(TECH.StringUtils).AddLeadingChar(LeverancierNummer,"0",5)
-
-	Quit AccountRelationHLX
+	Set Amount = PPL
+	Set $Extract(Amount,$Find(Amount,".")-1) = ","
+	
+	Quit Amount
 ]]></Implementation>
 </Method>
 
-<Method name="BepaalAmount">
+<Method name="BepaalItemRelation">
 <FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim Amount As %String
-	#dim PPL As %String = Product.Prijs.PPL
+	#dim ItemRelation As %String = Product.Basis.IdentNummer
 	
-	Set Amount = PPL
-	Set $Extract(Amount,$Find(Amount,".")-1) = ","
+	If ..IsBlumProduct {
+		If (..SoprAxProduct.HeeftVervangSoprPRNr = $$$True) {
+			#dim VervangProduct As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..SoprAxProduct.VervangSoprPRNr)
+			Set ItemRelation = VervangProduct.Basis.IdentNummer
+		}
+	}
 	
-	Quit Amount
+	Quit ItemRelation
 ]]></Implementation>
 </Method>
 
@@ -165,6 +203,42 @@
 	Quit PriceUnit
 ]]></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>
 </Class>
 
 
Index: AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml
===================================================================
diff -u -r42639 -r42650
--- AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml	(.../AankoopPrijzenLevIterator.cls.xml)	(revision 42639)
+++ AX/Uitgaand/PM/AankoopPrijzenLev/impl/AankoopPrijzenLevIterator.cls.xml	(.../AankoopPrijzenLevIterator.cls.xml)	(revision 42650)
@@ -57,6 +57,7 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%' AND (NonAktief IS null OR NonAktief = '2')"
+	//_" And ID IN ('1169448','1168200','1168542')"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>