Index: KPRIJSAX.mac.rou
===================================================================
diff -u -r50299 -r50904
--- KPRIJSAX.mac.rou	(.../KPRIJSAX.mac.rou)	(revision 50299)
+++ KPRIJSAX.mac.rou	(.../KPRIJSAX.mac.rou)	(revision 50904)
@@ -90,11 +90,9 @@
  Set KlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KLNr)
  Set Klant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(KlantID)
  Set BusinessType = Klant.GeefBusinessType()
+ 
  Do KKORTING, CALC
  
- // VHIP907: Verkoopprijzen
- // VHIP907->MVI: voorlopig laat ik alles invullen in fase 2a en overschrijf ik enkel de waarden die ax teruggeeft
- 
  If $$IsAX(KLNr,PRNr) {
 	Kill ^AXPrijsCache
 	Set CacheMinuten=$LG($G(^AXPrijsCache(KLNr,PRNr,$S($G(SimPPL):SimPPL,1:"*"),$S($G(Aantal):Aantal,1:"*"))),1)
@@ -106,19 +104,18 @@
 		Set PriceUnit=$LI(lb,4)
 		Set InclBTW=$LI(lb,5)
 	} Else {
-		Try 
-		{
-			New SalesPriceService, Result,PriceUnit,InclBTW
-			Set SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-			#Dim Result as AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
-			Set Result = SalesPriceService.GeefPrijs(KLNr, PRNr, $S($G(SimPPL):SimPPL,1:""),.Aantal)
-			Set VkpEURAX = Result.Price
-			Set LijstEURAX = Result.GrossPrice
-			Set PriceUnit=+Result.PriceUnit
-			Set InclBTW=SalesPriceService.PrijzenInclBTW()
+		Try {
+			New SalesPriceService, Result, ResultLine
 			
-			Set it=SalesPriceService.GeefRequestIterator()
-
+			#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+			#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(KLNr, PRNr, $select($get(SimPPL):SimPPL,1:""),.Aantal)
+			#dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1)
+			
+			Set VkpEURAX = ResultLine.Price
+			Set LijstEURAX = ResultLine.GrossPrice
+			Set PriceUnit = +ResultLine.PriceUnit
+			Set InclBTW = Result.InclVAT
+			
 			Set ^AXPrijsCache(KLNr,PRNr,$S($G(SimPPL):SimPPL,1:"*"),$S($G(Aantal):Aantal,1:"*"))=$LB($$GeefMinuten($H),VkpEUR,LijstEUR,PriceUnit,InclBTW)
 		} Catch {
 			Set (VkpEURAX,LijstEURAX)=99999
@@ -149,10 +146,10 @@
 		Set Korting2=0
 		If +LijstEUR=0 {
 			Set Korting1=0
-		} else {
+		} Else {
 			Set Korting1=(1-(VkpEUR/LijstEUR))*100
 		}
-	}
+	} 
 	Else
 	{
 		Write "**** Prijs is NUL ****"
Index: AX/Uitgaand/VKP/PrijsVerschilNrUitz/impl/PrijsUitzBuildCache.cls.xml
===================================================================
diff -u -r48131 -r50904
--- AX/Uitgaand/VKP/PrijsVerschilNrUitz/impl/PrijsUitzBuildCache.cls.xml	(.../PrijsUitzBuildCache.cls.xml)	(revision 48131)
+++ AX/Uitgaand/VKP/PrijsVerschilNrUitz/impl/PrijsUitzBuildCache.cls.xml	(.../PrijsUitzBuildCache.cls.xml)	(revision 50904)
@@ -1,65 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AX.Uitgaand.VKP.PrijsVerschilNrUitz.impl.PrijsUitzBuildCache">
-<IncludeCode>BL.Derde.LevSpecifiek,Prod.Product,vhLib.Macro</IncludeCode>
-<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+<IncludeCode>BL.Derde.LevSpecifiek,Prod.Product</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
 
-<Property name="LineNum">
-<Type>%Integer</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Converter">
-<Type>PrijsUitzDixfConverter</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="DynIterator">
+<Property name="KlantIterator">
 <Type>TECH.Iterator</Type>
-<Private>1</Private>
 </Property>
 
-<Property name="QueryAPI">
-<Type>TECH.Query.QueryAPI</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="ResultSet">
-<Type>TECH.ResultSet</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Nodes">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Data">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="itKlant">
-<Type>TECH.Iterator</Type>
-</Property>
-
-<Property name="Klant">
-<Type>DOM.VKP.VanHoeckeKlant</Type>
-</Property>
-
-<Property name="KLNr">
-<Type>%String</Type>
-</Property>
-
 <Property name="LaatsteAankoopMaand">
 <Type>%String</Type>
 </Property>
 
-<Property name="CacheGUID">
-<Type>%String</Type>
-<MultiDimensional>1</MultiDimensional>
-</Property>
-
 <Property name="OphalenTijd">
 <Type>%String</Type>
 </Property>
@@ -82,110 +34,166 @@
 
 <Property name="SalesPriceService">
 <Type>AXimpl.Admin.VKP.SalesPriceService</Type>
+<Private>1</Private>
 </Property>
 
+<Property name="ProductDataFactory">
+<Type>AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="MessageIdFormatter">
+<Type>AXimpl.MessageIdFormatter</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-		Set ..itKlant = ##class(TECH.DynamicIterator).%New(##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlantIterator(),,"(Item.GeefRegio()'=98)&&(Item.GeefRegio()'=99)")
-		Set ..LaatsteAankoopMaand="2016.01 "
-		Quit $$$OK
+	Set ..SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+	Set ..ProductDataFactory = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory).%New()
+	Set ..MessageIdFormatter = ##class(AXimpl.MessageIdFormatter).%New()
+	
+	Set ..KlantIterator = ##class(TECH.DynamicIterator).%New(##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlantIterator(),,"(Item.GeefRegio()'=98)&&(Item.GeefRegio()'=99)")
+	Set ..LaatsteAankoopMaand = "2016.01 "
+	
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="BuildAll">
-<ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set StartTijdstip=$zH
-	Set TotaalAantalAanvragen=0
-	Set TotaalAantalVerschillen=0
+	#dim StartTijdstip As %Integer = $zhorolog
+	#dim TotaalAantalAanvragen As %Integer = 0
+	#dim TotaalAantalVerschillen As %Integer = 0
+	
 	Kill ^||PrijsVerschillen
 	Kill ^||PrijsControle
-	While ..itKlant.HasNext()
-	{
-		Set ..Klant=..itKlant.Next()
-		Set ..KLNr=$P(..Klant.GeefID(),"||",2)
- 		Continue:(..Klant.GeefBusinessType() = ##class(DOM.VKP.enu.BusinessType).B2C())
+	
+	While (..KlantIterator.HasNext()) {
+		#dim Klant As DOM.VKP.VanHoeckeKlant = ..KlantIterator.Next()
+		
+ 		Continue:(Klant.GeefBusinessType() = ##class(DOM.VKP.enu.BusinessType).B2C())
 
-		;Do:";3042;23112;4810;1736;"[(";"_..KLNr_";") 
-		Do ..ControleerPrijzenVanKlant()
+		#dim KlantNummer As %String = $piece(Klant.GeefID(), "||", 2)
+		
+		Do ..ControleerPrijzenVanKlant(KlantNummer)
+		
 		Set TotaalAantalAanvragen=TotaalAantalAanvragen+..AantalAanvragen
 		Set TotaalAantalVerschillen=TotaalAantalVerschillen+..AantalVerschillen
-		Write $J($zH-StartTijdstip,0,0)," / "
+		
+		Write $justify($zhorolog - StartTijdstip, 0, 0), " / "
 	}
-	Write "Tijd/Aantal overall vr build cache: ", $zH-StartTijdstip," / ",TotaalAantalAanvragen," -> ",TotaalAantalVerschillen,!
+	
+	Write "Tijd/Aantal overall vr build cache: ", $zhorolog - StartTijdstip, " / ", TotaalAantalAanvragen, " -> ", TotaalAantalVerschillen, !
 ]]></Implementation>
 </Method>
 
 <Method name="ControleerPrijzenVanKlant">
+<FormalSpec>KlantNummer:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	Set (..OphalenTijd,..PrijsAXTijd,..PrijsAdminTijd,..AantalVerschillen,..AantalAanvragen)=0
-	Do ..OphalenProductenVanuitStatistiek()
-	If ..AantalAanvragen {
-		Do ..VoerUitPrijsCalculatieInAX()
-		Do ..VergelijkPrijzen()
+	Set (..OphalenTijd, ..PrijsAXTijd, ..PrijsAdminTijd, ..AantalVerschillen) = 0
+	
+	#dim ProductDataLijst As %ListOfDataTypes = ..GeefProductenVanuitStatistiek(KlantNummer)
+	Set ..AantalAanvragen = ProductDataLijst.Count()
+	
+	If (ProductDataLijst.Count() > 0) {
+		Do ..VoerUitPrijsCalculatieInAX(KlantNummer, ProductDataLijst)
+		Do ..VergelijkPrijzen(KlantNummer, ProductDataLijst)
 	}
-	Write ..KLNr,*9,..AantalAanvragen," -> ",..AantalVerschillen,*9,$J(..OphalenTijd,0,1)
-	Write " / ", $J(..PrijsAXTijd,0,1)," / ",$J(..PrijsAdminTijd,0,1),!
+	
+	Write KlantNummer, * 9, ..AantalAanvragen, " -> ", ..AantalVerschillen, * 9, $justify(..OphalenTijd, 0, 1)
+	Write " / ", $justify(..PrijsAXTijd, 0, 1), " / ", $justify(..PrijsAdminTijd, 0, 1), !
 ]]></Implementation>
 </Method>
 
-<Method name="OphalenProductenVanuitStatistiek">
+<Method name="GeefProductenVanuitStatistiek">
+<FormalSpec>KlantNummer:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
-	Set StartTijdstip=$zH
-	Set ..SalesPriceService=##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-	Do ..SalesPriceService.Initialisatie(..KLNr)
-	Kill ..CacheGUID
-	Set PRNr=$O(^KSTKL(..KLNr,0))
-	Set ..AantalAanvragen=0
-	While PRNr
-	{
-		Quit:$O(^KSTKL(..KLNr,PRNr,..LaatsteAankoopMaand))=""
-		Quit:$D(^KPR(PRNr,"J"_$$$LevHalux))
-		Quit:$$$PRGet($$$GenProduct)'=""
-		Quit:$$$PRGet($$$NONAktief)=1
-		Set MessageId=..SalesPriceService.VoegToeProduct(PRNr)
-		Set ..AantalAanvragen=..AantalAanvragen+1
-		Set ..CacheGUID(MessageId)=PRNr
-		Set PRNr=$O(^KSTKL(..KLNr,PRNr))
+	#dim ProductDataLijst As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#dim StartTijdstip As %Integer = $zhorolog
+	
+	#dim ProductNummer As %String = $order(^KSTKL(KlantNummer,0))
+	While ProductNummer {
+		Quit:($order(^KSTKL(KlantNummer, ProductNummer, ..LaatsteAankoopMaand)) = "")
+		Quit:$data(^KPR(ProductNummer, "J" _ $$$LevHalux))
+		Quit:$$$Not($$$PRGet($$$GenProduct) = "")
+		Quit:($$$PRGet($$$NONAktief) = 1)
+		
+		#dim ProductData As AXimpl.Admin.VKP.SalesPriceService.ProductData = ..ProductDataFactory.MaakProductData(ProductNummer)
+		Do ProductDataLijst.Insert(ProductData)
+		
+		Set ProductNummer = $order(^KSTKL(KlantNummer, ProductNummer))
 	}
-	Set ..OphalenTijd=$zH-StartTijdstip
+	
+	Set ..OphalenTijd = $zhorolog - StartTijdstip
+	
+	Quit ProductDataLijst
 ]]></Implementation>
 </Method>
 
 <Method name="VoerUitPrijsCalculatieInAX">
+<FormalSpec>KlantNummer:%String,ProductDataLijst:%ListOfDataTypes</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	Set StartTijdstip=$zH
-	Do ..SalesPriceService.VoerUit()
-	Set ..PrijsAXTijd=$zH-StartTijdstip
+	#dim StartTijdstip As %Integer = $zhorolog
+	#dim Resultaat As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = ..SalesPriceService.GeefPrijsVoorProducten(KlantNummer, ProductDataLijst)
+	
+	Set ..PrijsAXTijd = $zhorolog - StartTijdstip
 ]]></Implementation>
 </Method>
 
+<Method name="GeefProductNummer">
+<FormalSpec>ProductDataLijst:%ListOfDataTypes,MessageId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductNummer As %String = ""
+	#dim ProductDataIterator As TECH.Iterator = ##class(TECH.ListIterator).%New()
+	
+	While (ProductDataIterator.HasNext() && (ProductNummer = "")) {
+		#dim ProductData As AXimpl.Admin.VKP.SalesPriceService.ProductData = ProductDataIterator.Next()
+		
+		If (ProductData.Guid = MessageId) {
+			Set ProductNummer = ProductData.ProductNummer	
+		}
+	}
+	
+	Quit ProductNummer
+]]></Implementation>
+</Method>
+
 <Method name="VergelijkPrijzen">
+<FormalSpec>KlantNummer:%String,ProductDataLijst:%ListOfDataTypes</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	#dim Result as AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
-	Set StartTijdstip=$zH
-	Set it=..SalesPriceService.GeefResultaatIterator()
-	While it.HasNext()
-	{
-		Set Result=it.Next()
-		Set MessageId="{"_$zcvt(Result.MessageId,"U")_"}"
-		Set PRNr=$G(..CacheGUID(MessageId))
-		Set PrijsRec=$$KLANTPR^KPRIJSADMIN(..KLNr,PRNr)
+	#dim Iterator As TECH.Iterator = ..SalesPriceService.GeefResultaatIterator()
+	
+	While (Iterator.HasNext()) {
+		Set Result = Iterator.Next()
 		
-		If ((+Result.Price'=+$P(PrijsRec,"\",1))||(+Result.PriceUnit'=+$P(PrijsRec,"\",11)))&&('$L(Result.ErrorTxt))
-		{
-			Set $P(PrijsRec,"\",20)=Result.Price
-			Set $P(PrijsRec,"\",21)=Result.PriceUnit
-			Set ^||PrijsVerschillen(..KLNr,PRNr)=PrijsRec
-			Do ..WriteControle(..KLNr,PRNr,PrijsRec,Result,"Prijs")
-			Set ..AantalVerschillen=..AantalVerschillen+1
+		#dim MessageId As %String = ..MessageIdFormatter.Format(Result.MessageId)
+		#dim ProductNummer As %String = ..GeefProductNummer(ProductDataLijst, MessageId)
+		#dim PrijsRecord As %String = $$KLANTPR^KPRIJSADMIN(KlantNummer, ProductNummer)
+		#dim AdminPrice As %String = $piece(PrijsRecord, "\", 1)
+		#dim AdminPriceUnit As %String = $piece(PrijsRecord, "\", 11)
+		
+		If (($$$Not(+Result.Price = +AdminPrice) || $$$Not(+Result.PriceUnit = +AdminPriceUnit)) && $$$Not($length(Result.ErrorTxt))) {
+			Set $piece(PrijsRecord, "\", 20) = Result.Price
+			Set $piece(PrijsRecord, "\", 21) = Result.PriceUnit
+			
+			Set ^||PrijsVerschillen(KlantNummer, ProductNummer) = PrijsRecord
+			Do ..WriteControle(KlantNummer, ProductNummer, PrijsRecord, Result, "Prijs")
+			Set ..AantalVerschillen = ..AantalVerschillen + 1
 		}
-		If ($L(Result.ErrorTxt))
-		{
-			Do ..WriteControle(..KLNr,PRNr,PrijsRec,Result,"Error")
+		
+		If ($length(Result.ErrorTxt)) {
+			Do ..WriteControle(KlantNummer, ProductNummer, PrijsRecord, Result, "Error")
 		}
 	}
 ]]></Implementation>
Index: KPRIJS.mac.rou
===================================================================
diff -u -r50831 -r50904
--- KPRIJS.mac.rou	(.../KPRIJS.mac.rou)	(revision 50831)
+++ KPRIJS.mac.rou	(.../KPRIJS.mac.rou)	(revision 50904)
@@ -103,23 +103,26 @@
 		Set PriceUnit=$LI(lb,4)
 		Set InclBTW=$LI(lb,5)
 	} Else {
-		Try 
-		{
+		Try {
 			New SalesPriceService, Result
-			Set SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-			#Dim Result as AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
-			Set Result = SalesPriceService.GeefPrijs(KLNr, PRNr, $S($G(SimPPL):SimPPL,1:""),.Aantal)
-			Set VkpEURAX = Result.Price
-			Set LijstEURAX = Result.GrossPrice
-			Set PriceUnit=+Result.PriceUnit
-			Set InclBTW=SalesPriceService.PrijzenInclBTW()
+			
+			#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+			#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(KLNr, PRNr, $select($Get(SimPPL):SimPPL, 1:""), .Aantal)
+			#dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1)
+			
+			Set VkpEURAX = ResultLine.Price
+			Set LijstEURAX = ResultLine.GrossPrice
+			Set PriceUnit = +ResultLine.PriceUnit
+			Set InclBTW = Result.InclVAT
+			
 			Set ^AXPrijsCache(KLNr,PRNr,+CachePPL,$S($G(Aantal):Aantal,1:"*"))=$LB($$GeefMinuten($H),VkpEURAX,LijstEURAX,PriceUnit,InclBTW)
 		} Catch {
 			Set (VkpEURAX,LijstEURAX)=99999
 			Set PriceUnit=1
-			Set InclBTW=0 
+			Set InclBTW = $$$False 
+			
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() 
-			do ##class(vhLib.Logger).LogExceptie(Exception)
+			Do ##class(vhLib.Logger).LogExceptie(Exception)
 		}
 	}
 	
@@ -140,14 +143,13 @@
 		}
 		Set GrOrde=$Case(PriceUnit,100:"H",:"E")
 		Set GrOrdNum=$Case(GrOrde,"H":100,:1)
- 
 		Set Korting2=0
 		If +LijstEUR=0 {
 			Set Korting1=0
-		} else {
+		} Else {
 			Set Korting1=(1-(VkpEUR/LijstEUR))*100
 		}
-	} else {
+	} Else {
 		Do:(+VkpEUR>0)||(+VkpEURAX>0) ##class(vhLib.Logger).%New().Warning("Prijsberekening AX Fallback","Klant : '"_KLNr_"' Product : '"_PRNr_"' SimPPL : '"_$G(SimPPL)_"' -> Prijs : "_VkpEURAX_" -> fallback naar cache berekening '"_VkpEUR_"'")
 	}	
  }
@@ -304,36 +306,40 @@
  Quit R
  
 GeefLijstPrijsInAX(PRNr,SimCifPPL,AdminLijstPr)
-	New Result,CachePPL,VkpEURAX, VkpEUR,LijstEURAX,PriceUnit,IncBTW,KLNr
-	#Dim Result as AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
+	New CachePPL,VkpEURAX, VkpEUR,LijstEURAX,PriceUnit,IncBTW,KLNr
+	
 	Quit:$$ProdViaAdmin(PRNr) AdminLijstPr
 	Set KLNr=$$$CKlantL
 	
  	Set CachePPL=$S($G(SimPPL):SimPPL,1:$$CifPPL(PRNr))
 	Set CacheMinuten = $ListGet($Get(^AXPrijsCache(KLNr,PRNr,+CachePPL,"*")),1)
+ 	
  	If (($$GeefMinuten($Horolog)-600) < CacheMinuten) {
 		Set lb=^AXPrijsCache(KLNr,PRNr,+CachePPL,"*")
 		Set VkpEURAX=$LI(lb,2)
 		Set PriceUnit=$LI(lb,4)
 		Set InclBTW=$LI(lb,5)
 	} Else {
-		Try 
-		{
-			New SalesPriceService, Result
-			Set SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-			#Dim Result as AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
-			Set Result = SalesPriceService.GeefPrijs(KLNr, PRNr, $S($G(SimPPL):SimPPL,1:""),.Aantal)
-			Set VkpEURAX = Result.Price
-			Set LijstEURAX = Result.GrossPrice
-			Set PriceUnit=+Result.PriceUnit
-			Set InclBTW=SalesPriceService.PrijzenInclBTW()
+		Try {
+			New SalesPriceService, Result, ResultLine
+			
+			#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+			#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(KLNr, PRNr, $select($get(SimPPL):SimPPL,1:""),.Aantal)
+			#dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1)
+			
+			Set VkpEURAX = ResultLine.Price
+			Set LijstEURAX = ResultLine.GrossPrice
+			Set PriceUnit = +ResultLine.PriceUnit
+			Set InclBTW = Result.InclVAT
+			
 			Set ^AXPrijsCache(KLNr,PRNr,+CachePPL,"*")=$LB($$GeefMinuten($H),VkpEURAX,LijstEURAX,PriceUnit,InclBTW,"LP")
 		} Catch {
 			Set (VkpEURAX)=99999
 			Set PriceUnit=1
-			Set InclBTW=0 
+			Set InclBTW = $$$False
+			 
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() 
-			do ##class(vhLib.Logger).LogExceptie(Exception)
+			Do ##class(vhLib.Logger).LogExceptie(Exception)
 		}
 	}
 	
@@ -348,10 +354,9 @@
 		{ 
 			Set VkpEUR=VkpEUR/PriceUnit
 		}
- 
-	} else {
+	} Else {
 		Set VkpEUR=AdminLijstPr
-		do:(+VkpEUR>0)||(+VkpEURAX>0) ##class(vhLib.Logger).%New().Warning("Prijsberekening AX Fallback","LIJSTPRIJS Klant : '"_KLNr_"' Product : '"_PRNr_"' SimPPL : '"_$G(SimPPL)_"' -> Prijs : "_VkpEURAX_" -> fallback naar cache berekening '"_$G(AdminLijstPr)_"'")
+		Do:(+VkpEUR>0)||(+VkpEURAX>0) ##class(vhLib.Logger).%New().Warning("Prijsberekening AX Fallback","LIJSTPRIJS Klant : '"_KLNr_"' Product : '"_PRNr_"' SimPPL : '"_$G(SimPPL)_"' -> Prijs : "_VkpEURAX_" -> fallback naar cache berekening '"_$G(AdminLijstPr)_"'")
 	}	
  	Quit VkpEUR
 
@@ -643,3 +648,4 @@
  . Set J=$O(^KPR(PRNr,"J")),R=^(J),PPL=$P(R,D,19)
  . Set:+PPL=+SchaduwPPL SchaduwPPL=""
  Quit SchaduwPPL
+
Index: AXimpl/Admin/VKP/SalesPriceService.cls.xml
===================================================================
diff -u -r50886 -r50904
--- AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 50886)
+++ AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 50904)
@@ -2,23 +2,15 @@
 <Export generator="Cache" version="24">
 <Class name="AXimpl.Admin.VKP.SalesPriceService">
 <Description><![CDATA[
-/ SalesPrice kan voor een of meerdre producten:
-<br/>Voor 1 product: 
-<br/>  Set Result = SalesPriceService.GeefPrice(KLNr, PRNr, optionele CifPPL)
-<br/>Voor meerdere producten via iterator:
-<br/>  Do SalesPriceService.Initialisatie(KLNr)
-<br/>  Do SalesPriceService.VoegToe(PRNr1, optionele CifPPL)
-<br/>  Do SalesPriceService.VoegToe(PRNr2, optionele CifPPL)
-<br/>  Do SalesPriceService.VoerUit()
-<br/>  Set iterator=SalesPriceService.GeefResultaatIterator
-<br/>  
-<br/>Voor meerdere producten via het onthouden van een reference:
-<br/>  Do SalesPriceService.Initialisatie(KLNr)
-<br/>  Set Reference1=SalesPriceService.VoegToe(PRNr1, optionele CifPPL)
-<br/>  Set Reference2=SalesPriceService.VoegToe(PRNr2, optionele CifPPL)
-<br/>  Do SalesPriceService.VoerUit()
-<br/>  Do SalesPriceService.GeefResultaat(Reference1)
-<br/>  Do SalesPriceService.GeefResultaat(Reference2)]]></Description>
+SalesPrice voor één product:
+<br/> Set Result = SalesPriceService.GeefPrijs(KlantNummer, ProductNummer, CifPpl (optioneel), Aantal (optioneel), TransDate (optioneel))
+<br/>
+SalesPrice voor meerdere producten:
+<br/> Set ProductDataFactory = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory).%New()
+<br/> Set ProductDataLijst = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductDataLijst).%New()
+<br/> Do ProductDataLijst.Insert(ProductDataFactory.MaakProductData(ProductNummer, CifPpl (optioneel))
+<br/> Do ProductDataLijst.Insert(ProductDataFactory.MaakProductData(ProductNummer, CifPpl (optioneel))
+<br/> Set Result = SalesPriceService.GeefPrijsVoorProducten(KlantNummer, ProductDataLijst)]]></Description>
 <IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
 <Super>TECH.Mockable</Super>
 
@@ -37,29 +29,13 @@
 <Private>1</Private>
 </Property>
 
-<Property name="SoprConvertor">
-<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Property name="AxItemIdBepaler">
+<Type>AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="Request">
-<Type>AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="Result">
-<Type>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="ModifyPrijsGeg">
-<FormalSpec>KlantNummer:%String,ProductNummer:%String,PrijsRec:%String</FormalSpec>
-<Implementation><![CDATA[	Quit PrijsRec
-]]></Implementation>
-</Method>
-
 <Method name="%OnNew">
-<FormalSpec>SalesPriceService:AXimpl.Dynamics.SalesPriceOut.SalesPriceService="",MessageManager:AXimpl.MessageManager="",KlantIdConverter:AXimpl.Utils.KlantIdConverter=""</FormalSpec>
+<FormalSpec>SalesPriceService:AXimpl.Dynamics.SalesPriceOut.SalesPriceService="",MessageManager:AXimpl.MessageManager="",KlantIdConverter:AXimpl.Utils.KlantIdConverter="",AxItemIdBepaler:AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -70,119 +46,98 @@
 	
 	Set ..MessageManager = $$$Inject(MessageManager, ##class(AXimpl.MessageManager).%New())
 	Set ..KlantIdConverter = $$$Inject(KlantIdConverter, ##class(AXimpl.Utils.KlantIdConverter).%New())
-	Set ..SoprConvertor = ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..AxItemIdBepaler = $$$Inject(AxItemIdBepaler, ##class(AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="Initialisatie">
-<FormalSpec>KlantNummer:%String</FormalSpec>
+<Method name="GeefPrijsVoorProducten">
+<FormalSpec>KlantNummer:%String,ProductDataLijst:%ListOfDataTypes</FormalSpec>
+<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
 <Implementation><![CDATA[
-	Set ..Request = ##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC).%New()
+	#dim RequestLines As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#dim ProductDataIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(ProductDataLijst)
 	
-	Set ..Request.CustAccount = ..KlantIdConverter.ConvertToAx(KlantNummer, ##class(DOM.common.enu.Personality).VanHoecke())
-	Set ..Request.CalcPrice = $$$True
-	Set ..Request.CalcStock = $$$True ;$$$False
-	Set ..Request.MessageId = ..MessageManager.GenerateID()
+	While (ProductDataIterator.HasNext()) {
+		#dim ProductData As AXimpl.Admin.VKP.SalesPriceService.ProductData = ProductDataIterator.Next()
+		#dim RequestLine As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC = ..MaakRequestLine(ProductData.ProductNummer, ProductData.CifPpl)
+		
+		Do RequestLines.Insert(RequestLine)	
+	}
+	
+	#dim Request As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC = ..MaakRequest(KlantNummer, RequestLines)
+	
+	Quit ..SalesPriceService.getPrice(Request)
 ]]></Implementation>
 </Method>
 
-<Method name="VoegToeProduct">
-<FormalSpec>ProductNummer:%String,CifPPL:%String="",Aantal:%String=1,TransDate:%Date</FormalSpec>
-<ReturnType>%String</ReturnType>
+<Method name="GeefPrijs">
+<FormalSpec>KlantNummer:%String,ProductNummer:%String,CifPpl:%String,Aantal:%String=1,TransDate:%Date=""</FormalSpec>
+<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
 <Implementation><![CDATA[
-	If CifPPL="", ($$$ProductGet(ProductNummer,$$$GenProduct)?4.N)&&((";"_$$$LevHalux_";"_$$$LevVanHoecke_";")[(";"_$$$ProductGet(ProductNummer,$$$LeveranciersNr)_";")) {
-		Set CifPPL=$$$ProductGet(ProductNummer,$$$CifPPLEUR)
-		Set ProductNummer=$$$ProductGet(ProductNummer,$$$GenProduct)
+	If (CifPpl = "") {
+		If (($$$ProductGet(ProductNummer,$$$GenProduct)?4.N) && ((";"_$$$LevHalux_";"_$$$LevVanHoecke_";") [ (";"_$$$ProductGet(ProductNummer,$$$LeveranciersNr)_";"))) {	
+			Set CifPpl = $$$ProductGet(ProductNummer, $$$CifPPLEUR)
+			Set ProductNummer = $$$ProductGet(ProductNummer, $$$GenProduct)
+		}
+		
+		If ($$IsOrgaluxOpMaat^PRODUKT2(ProductNummer)) {	
+			Set CifPpl = $$$ProductGet(ProductNummer, $$$CifPPLEUR)
+			Set ProductNummer = 1804877 ; GEN.ORGALUX INGEKORT  XXX
+		}	
 	}
 	
-	If CifPPL="",$$IsOrgaluxOpMaat^PRODUKT2(ProductNummer) {
-		Set CifPPL=$$$ProductGet(ProductNummer,$$$CifPPLEUR)
-		Set ProductNummer=1804877 ; GEN.ORGALUX INGEKORT  XXX
-	}
+	#dim RequestLine As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC = ..MaakRequestLine(ProductNummer, CifPpl, Aantal, TransDate)
+	#dim RequestLines As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes(RequestLine)
+	#dim Request As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC = ..MaakRequest(KlantNummer, RequestLines)
 	
-	Set ProdRequest = ##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC).%New()
-	Set ProdRequest.MessageId = ..MessageManager.GenerateID()
-	Set ProdRequest.ItemId = ..GeefAXItemID(ProductNummer)
-	Set ProdRequest.Qty = Aantal
-	Set ProdRequest.SalesUnit = "STK"
-	Set ProdRequest.TransDate = $SELECT($GET(TransDate):+TransDate,1:+$H)
-	Set ProdRequest.CurrencyCode = "EUR"
-	Set:CifPPL'="" ProdRequest.CostPrice = +$JUSTIFY(CifPPL,0,2)
-	Do ..Request.Lines.Insert(ProdRequest)
-		
-	Quit ProdRequest.MessageId
+	Quit ..SalesPriceService.getPrice(Request)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefResultaat">
-<FormalSpec>Reference:%String</FormalSpec>
-<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC</ReturnType>
+<Method name="MaakRequest">
+<FormalSpec>KlantNummer:%String,Lines:%ListOfDataTypes</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC</ReturnType>
 <Implementation><![CDATA[
-	#dim Iterator As TECH.Iterator = ..GeefResultaatIterator()
-	#dim Found As %Boolean = $$$False
-	#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
+	#dim Request As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC= ##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC).%New()
 	
-	While (Iterator.HasNext() && $$$Not(Found)) {
-		Set Result = Iterator.Next()
-		Set:(Reference = ("{" _ $ZCONVERT(Result.MessageId,"U") _ "}")) Found = $$$True
-	}
-
-	Quit $SELECT(Found:Result,1:"")
+	Set Request.CustAccount = ..KlantIdConverter.ConvertToAx(KlantNummer, ##class(DOM.common.enu.Personality).VanHoecke())
+	Set Request.CalcPrice = $$$True
+	Set Request.CalcStock = $$$True
+	Set Request.MessageId = ..MessageManager.GenerateID()
+	Set Request.Lines = Lines
+	
+	Quit Request
 ]]></Implementation>
 </Method>
 
-<Method name="GeefResultaatIterator">
-<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..Result.Lines)
-]]></Implementation>
-</Method>
-
-<Method name="GeefRequestIterator">
-<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..Request.Lines)
-]]></Implementation>
-</Method>
-
-<Method name="VoerUit">
-<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
-<Implementation><![CDATA[	Set ..Result = ..SalesPriceService.getPrice(..Request)
-]]></Implementation>
-</Method>
-
-<Method name="GeefPrijs">
-<FormalSpec>KlantNummer:%String,ProductNummer:%String,CifPPL:%String,Aantal:%String,TransDate:%Date</FormalSpec>
-<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
-<Implementation><![CDATA[
-	Do ..Initialisatie(KlantNummer)
-	#dim Reference As %String = ..VoegToeProduct(ProductNummer, .CifPPL, .Aantal,.TransDate)
-	Do ..VoerUit()
-	Quit ..GeefResultaat(Reference)
-]]></Implementation>
-</Method>
-
-<Method name="GeefAXItemID">
-<FormalSpec>PRNr:%String</FormalSpec>
+<Method name="MaakRequestLine">
+<FormalSpec>ProductNummer:%String,CifPpl:%String,Aantal:%String=1,TransDate:%Date=""</FormalSpec>
 <Private>1</Private>
-<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim AxProduct As AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct = ..SoprConvertor.AdminNaarAx(PRNr)
+	#dim RequestLine As AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC = ##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC).%New()
 	
-	If $ISOBJECT(AxProduct),AxProduct.IsSoprInCache {
-		Set PRNr = AxProduct.VervangSoprPRNr
+	Set RequestLine.MessageId = ..MessageManager.GenerateID()
+	Set RequestLine.ItemId = ..AxItemIdBepaler.GeefAxItemId(ProductNummer)
+	Set RequestLine.Qty = Aantal
+	Set RequestLine.SalesUnit = "STK"
+	Set RequestLine.CurrencyCode = "EUR"
+	
+	If $$$Not(TransDate = "") {
+		Set RequestLine.TransDate = +TransDate
+	} Else {
+		Set RequestLine.TransDate = +$Horolog
 	}
 	
-	Quit $PIECE(^KPR(PRNr,2),"\",25) ; Identnummer
+	If $$$Not(CifPpl = "") {
+		Set RequestLine.CostPrice = +$justify(CifPpl, 0, 2)
+	}
+	
+	Quit RequestLine
 ]]></Implementation>
 </Method>
-
-<Method name="PrijzenInclBTW">
-<Description><![CDATA[
-enkel gebruikt inb PVAX.mac --> wegwerken]]></Description>
-<FormalSpec>KLNr:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..Result.InclVAT
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: PVAX.mac.rou
===================================================================
diff -u -r50299 -r50904
--- PVAX.mac.rou	(.../PVAX.mac.rou)	(revision 50299)
+++ PVAX.mac.rou	(.../PVAX.mac.rou)	(revision 50904)
@@ -52,22 +52,24 @@
 PrijsDtl(KLNr,PRNr,SimPPL,Aantal)
 	Set Tijd=$zh
 	Write:'DiffOnly !,PRNr," ",$P(^KPR(PRNr,2),"\",25)," ",$P(^KPR(PRNr,0),"\"),!
+	
 	If Detail
-	{ 
-		Set SalesPriceService=##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-		s x =$$$ProductGet(PRNr, $$$CifPPLEUR)
-		Set Result=SalesPriceService.GeefPrijs(KLNr,PRNr,$G(SimPPL),$G(Aantal))
-		Set it=SalesPriceService.GeefRequestIterator()
+	{
+		New SalesPriceService, Result, ResultLine
+		
+		#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+		#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(KLNr, PRNr, $get(SimPPL), $get(Aantal))
+		#dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1)
 
-		d DumpObject^%apiOBJ(it.Next())
-		d DumpObject^%apiOBJ(Result)
+		Do DumpObject^%apiOBJ(ResultLine)
+		Do DumpObject^%apiOBJ(Result)
 	}
+	
 	Set:$G(Aantal)'>0 PrijsRec=$$KLANTPR^KPRIJSADMIN(KLNr,PRNr,,.SimPPL)
 	Set:$G(Aantal)>0 PrijsRec=$$KlantPrijs^KPRIJSADMIN(KLNr,PRNr,,,Aantal)
 	Set:$G(Aantal)'>0 PrijsRecAX=$$KLANTPR^KPRIJSAX(KLNr,PRNr,,.SimPPL)
 	Set:$G(Aantal)>0 PrijsRecAX=$$KlantPrijs^KPRIJSAX(KLNr,PRNr,,,Aantal)
-	;Set:$G(Aantal)'>0 PrijsRecAX2=$$KLANTPR^KPRIJSAX(KLNr,PRNr,,.SimPPL)
-	;Set:$G(Aantal)>0 PrijsRecAX2=$$KlantPrijs^KPRIJSAX(KLNr,PRNr,,,Aantal)
+
 	If '$G(DiffOnly)&&(KLNr=1614) ; incl BTW
 	{
 		Write "Admin prijs incl BTW: ",$J($P(PrijsRec,"\")*1.21,0,2),!
@@ -148,16 +150,19 @@
 
 	Quit
 	
-PrijsOphalen(KLNr,PRNr,CifPPL,Aantal)
-	Set SalesPriceService=##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-	s x =$$$ProductGet(PRNr, $$$CifPPLEUR)
+PrijsOphalen(KLNr,PRNr,CifPPL,Aantal)	
 	Write !,KLNr," ",$P(^KKL(^KK1(KLNr),0),"\",2),!
 	Write PRNr," ",$P(^KPR(PRNr,2),"\",25)," ",$P(^KPR(PRNr,0),"\"),!
-	Set Result=SalesPriceService.GeefPrijs(KLNr,PRNr,.CifPPL,.Aantal)
-	Set it=SalesPriceService.GeefRequestIterator()
+
+	New SalesPriceService, Result, ResultLine
+		
+	#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+	#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(KLNr, PRNr, CifPPL, Aantal)
+	#dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1)
+
+	;Do DumpObject^%apiOBJ(Result.Lines.GetAt(1))
+	;Do DumpObject^%apiOBJ(Result)
 	
-	;d DumpObject^%apiOBJ(it.Next())
-	;d DumpObject^%apiOBJ(Result)
 	Set:'$G(Aantal) PrijsRec=$$KLANTPR^KPRIJSADMIN(KLNr,PRNr,,.CifPPL)
 	Set:$G(Aantal) PrijsRec=$$KlantPrijs^KPRIJSADMIN(KLNr,PRNr,,,Aantal)
 	Write !,"Admin prijs: ",$P(PrijsRec,"\")," lijstprijs : ",$P(PrijsRec,"\",4),!
@@ -167,7 +172,7 @@
 	Write !,"Admin: ",PrijsRec,!
 	Write "AX   : ",PrijsRecAX,!
 
-	q
+	Quit
 	
 All
 	Set DiffOnly=0
@@ -188,10 +193,12 @@
 	Do Klant(11409,DiffOnly) ; 
 	Do Klant(13353,DiffOnly) ; 
 	Do Klant(13604,DiffOnly) ; 
-	Q
+	
+	Quit
+	
 Klant(KLNr,DiffOnly)	
 	Set TijdStipStartLog=$zH
-	s DiffOnly=0
+	Set DiffOnly=0
 	Set Dev=$$OPEN^vhDEV("e:\AX","PrijsVGL AX "_KLNr_" - "_$TR($ZDT($H,8),":")_".txt","W")
 	Use Dev
 	
@@ -229,79 +236,99 @@
 	}	
 	Do CLOSE^vhDEV(Dev)
 	Write "ALL=",$ZH-TijdStipStartAll,!
-	q
+	
+	Quit
 
 KlantCheck(KLNr,DiffOnly)
-	Set SalesPriceService=##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-	Do SalesPriceService.Initialisatie(KLNr)
-	Kill CacheId
-	Kill CacheCif
+	New ProductDataFactory, ProductDataLijst, SalesPriceService
+		
+	#dim ProductDataFactory As AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory).%New()
+	#dim ProductDataLijst As AXimpl.Admin.VKP.SalesPriceService.ProductDataLijst = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductDataLijst).%New()
+	#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+	
 	Set PRNr=$O(^KSTKL(KLNr,0))
-	Set Count=0,CountAll=0
-	While PRNr
+	Set CountAll=0
+	
+	While (PRNr)
 	{
-		
 		If $D(^KPR(PRNr)) && ($O(^KSTKL(KLNr,PRNr,"2016.07 "))'="") && ('$D(^KPR(PRNr,"J"_$$$LevHalux))) && ($$$PRGet($$$GenProduct)="") && ($$$PRGet($$$NONAktief)'=1) && '$$IsOrgaluxOpMaat^PRODUKT2(PRNr)
 		{
 			If 1||($P($$KLANTPR^KPRIJSADMIN(KLNr,PRNr),"\",8)'="K") ; GEEN KAT omdat de klantgrp op AX klant nog niet is ingevuld
 			{
-				Set MessageId=SalesPriceService.VoegToeProduct(PRNr)
-				Set Count=Count+1
+				Do ProductDataLijst.Insert(ProductDataFactory.MaakProductData(PRNr))
+				
 				Set CountAll=CountAll+1
-				Set CacheId(MessageId)=PRNr
-				If Count=100 {
-					Do Compare(KLNr,SalesPriceService)
+				
+				If (ProductDataLijst.Count() = 100) {
+					Do Compare(KLNr, SalesPriceService, ProductDataLijst)
 					Use 0
-					Write KLNr," ",Count," ",CountAll," ",$ZH-TijdStipStartLog,!
+					Write KLNr, " ", ProductDataLijst.Count(), " ", CountAll, " ", $zhorolog - TijdStipStartLog, !
 					Use Dev
-					Set SalesPriceService=##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-					Do SalesPriceService.Initialisatie(KLNr)
-					Set Count=0
+					Set ProductDataLijst = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductDataLijst).%New()
 					Set TijdStipStartLog=$zh
-					Kill CacheId
 				}
 			}
 		}
-		Set PRNr=$O(^KSTKL(KLNr,PRNr))
+		Set PRNr= $O(^KSTKL(KLNr,PRNr))
 	}
-	Do:Count Compare(KLNr,SalesPriceService)
 	
+	Do:(ProductDataLijst.Count()) Compare(KLNr, SalesPriceService, ProductDataLijst)
+	
 	Quit CountAll
 	
-Compare(KLNr,SalesPriceService)
-		Do SalesPriceService.VoerUit()
-		Set it=SalesPriceService.GeefResultaatIterator()
-		While it.HasNext()
-		{
-
-			Set Result=it.Next()
-			Set MessageId="{"_$zcvt(Result.MessageId,"U")_"}"
-			Set PRNr=$G(CacheId(MessageId))
-			Set PrijsRec=$$KLANTPR^KPRIJSADMIN(KLNr,PRNr)
-			Set:SalesPriceService.PrijzenInclBTW() $P(PrijsRec,"\",1)=$J($P(PrijsRec,"\",1)*1.21,0,2)
-			Set Diff=""
-			Set:'$L(Result.ErrorTxt) Diff=$$$ExcelNum((Result.Price/Result.PriceUnit)-($P(PrijsRec,"\",1)/$P(PrijsRec,"\",11)))
-			If '$G(DiffOnly)||((Diff>0.01)||(Diff<-0.01))||$L(Result.ErrorTxt)
-			{
-				write Result.MessageId,*9
-				Write KLNr,*9,$P(^KKL(^KK1(KLNr),0),"\",2),*9
-				Write PRNr,*9,Result.ItemId,*9,$$$PRGet($$$KortTekst)
-				Write *9,$P(PrijsRec,"\",7),*9,$P(PrijsRec,"\",8)
-				Write *9,SalesPriceService.PrijzenInclBTW(),*9,$$$ExcelNum(Result.Price),*9,Result.PriceUnit
-				Write *9,$$$ExcelNum($P(PrijsRec,"\",1)),*9,$P(PrijsRec,"\",11)
-				Write *9,Diff
-				Write *9,Result.ErrorTxt
-				Write *9,$$$PRGet($$$SubGroep)
-				Write !
-			}
+Compare(KLNr, SalesPriceService, ProductDataLijst)
+	New Result, ResultLine, ResultLineIterator, MessageId, MessageIdFormatter, ProductNummer
+	
+	#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijsVoorProducten(KLNr, ProductDataLijst)
+	#dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
+	#dim ResultLineIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Result.Lines)
+	#dim MessageId As %String
+	#dim MessageIdFormatter As AXimpl.MessageIdFormatter = ##class(AXimpl.MessageIdFormatter).%New()
+	#dim ProductNummer As %String
+	
+	While (ResultLineIterator.HasNext()) {
+		Set ResultLine = ResultLineIterator.Next()
+		Set MessageId = MessageIdFormatter.Format(ResultLine.MessageId)
+		Set ProductNummer = ProductDataLijst.FindByMessageId(MessageId)
+		Set PrijsRec = $$KLANTPR^KPRIJSADMIN(KLNr, ProductNummer)
+		
+		If (Result.InclVAT) {
+			Set $piece(PrijsRec, "\", 1) = $justify($piece(PrijsRec, "\", 1) * 1.21, 0, 2)
 		}
+		
+		Set Diff = ""
+		
+		If $$$Not($length(ResultLine.ErrorTxt)) {
+			Set Diff = $$$ExcelNum((ResultLine.Price / ResultLine.PriceUnit) - ($piece(PrijsRec, "\", 1) / $piece(PrijsRec, "\", 11)))
+		}
+		
+		If ($$$Not($get(DiffOnly)) || ((Diff > 0.01) || (Diff < -0.01)) || $length(ResultLine.ErrorTxt)) {
+			Write ResultLine.MessageId, *9
+			Write KLNr, *9, $piece(^KKL(^KK1(KLNr), 0), "\", 2), *9
+			Write ProductNummer, *9, ResultLine.ItemId, *9, $$$PRGet($$$KortTekst)
+			Write *9, $piece(PrijsRec, "\", 7), *9, $piece(PrijsRec, "\", 8)
+			Write *9, Result.InclVAT, *9, $$$ExcelNum(ResultLine.Price), *9, ResultLine.PriceUnit
+			Write *9, $$$ExcelNum($piece(PrijsRec, "\", 1)), *9, $piece(PrijsRec, "\", 11)
+			Write *9, Diff
+			Write *9, ResultLine.ErrorTxt
+			Write *9, $$$PRGet($$$SubGroep)
+			Write !
+		}
+	}
+	
 	Quit
 			
 KlantSingle(KLNr)
 	Set TijdStipStartLog=$zH
 	Set PRNr=$O(^KSTKL(KLNr,0))
 	Set Count=0
-	While PRNr
+	
+	New SalesPriceService, Result
+	
+	#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+	#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC
+	
+	While (PRNr)
 	{
 		If ($O(^KSTKL(KLNr,PRNr,"2016.07 "))'="") && ('$D(^KPR(PRNr,"J"_$$$LevHalux))) && ($$$PRGet($$$GenProduct)="") && ($$$PRGet($$$NONAktief)'=1) && '$$IsOrgaluxOpMaat^PRODUKT2(PRNr)
 		{
@@ -310,30 +337,37 @@
 			} Else {
 				Set CifPPL=""
 			}
-			Set SalesPriceService=##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-			Do SalesPriceService.Initialisatie(KLNr)
-			Set MessageId=SalesPriceService.VoegToeProduct(PRNr,CifPPL)
-			Do SalesPriceService.VoerUit()
-			Set it=SalesPriceService.GeefResultaatIterator()
+			
+			Set Result = SalesPriceService.GeefPrijs(KLNr, PRNr, CifPPL)
 			Set Count=Count+1
 		}
 		Set PRNr=$O(^KSTKL(KLNr,PRNr))
 	}
-	Write KLNr," #Prod:",Count," Ophalen:",$ZH-TijdStipStartLog,!
+	
+	Write KLNr, " #Prod:", Count, " Ophalen:", $zhorolog - TijdStipStartLog, !
+	
 	Quit
+	
 Multi
-	Set SalesPriceService=##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-	Do SalesPriceService.Initialisatie(4810)
-	Do SalesPriceService.VoegToeProduct(3551)
-	Do SalesPriceService.VoegToeProduct(685017)
-	Do SalesPriceService.VoegToeProduct(675436,100)
-	Do SalesPriceService.VoerUit()
-	Set it=SalesPriceService.GeefResultaatIterator()
-	While it.HasNext()
-	{
-		Set Result=it.Next()
-		d DumpObject^%apiOBJ(Result)
+	New ProductDataFactory, ProductDataLijst, SalesPriceService, Result, ResultLine, ResultLineIterator
+	
+	#dim ProductDataFactory As AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory).%New()
+	#dim ProductDataLijst As AXimpl.Admin.VKP.SalesPriceService.ProductDataLijst = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductDataLijst).%New()
+	
+	Do ProductDataLijst.Insert(ProductDataFactory.MaakProductData(3551))
+	Do ProductDataLijst.Insert(ProductDataFactory.MaakProductData(685017))
+	Do ProductDataLijst.Insert(ProductDataFactory.MaakProductData(675436, 100))
+	
+	#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+	#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(4810, ProductDataLijst)
+	#dim ResultLineIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Result.Lines)
+	#dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
+	
+	While (ResultLineIterator.HasNext()) {
+		Set ResultLine = ResultLineIterator.Next()
+		Do DumpObject^%apiOBJ(ResultLine)
 	}
+	
 	Quit
 KLANTPR
 	Set PRNr=3551
Index: vhTest/Mock/AXimpl/Admin/VKP/SalesPriceService.cls.xml
===================================================================
diff -u -r50699 -r50904
--- vhTest/Mock/AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 50699)
+++ vhTest/Mock/AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 50904)
@@ -9,58 +9,16 @@
 <Inheritance>right</Inheritance>
 
 <Method name="GeefPrijs">
-<FormalSpec>KlantNummer:%String,ProductNummer:%String,CifPPL:%String,Aantal:%String,TransDate:%Date</FormalSpec>
+<FormalSpec>KlantNummer:%String,ProductNummer:%String,CifPpl:%String,Aantal:%String=1,TransDate:%Date=""</FormalSpec>
 <ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefPrijs",KlantNummer,ProductNummer,CifPPL,Aantal,TransDate)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefPrijs",KlantNummer,ProductNummer,CifPpl,Aantal,TransDate)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefRequestIterator">
-<Implementation><![CDATA[	do ..VerwerkMethodCall("GeefRequestIterator")
-]]></Implementation>
-</Method>
-
-<Method name="GeefResultaat">
-<FormalSpec>Reference:%String</FormalSpec>
-<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefResultaat",Reference)
-]]></Implementation>
-</Method>
-
-<Method name="GeefResultaatIterator">
-<Implementation><![CDATA[	do ..VerwerkMethodCall("GeefResultaatIterator")
-]]></Implementation>
-</Method>
-
-<Method name="Initialisatie">
-<FormalSpec>KlantNummer:%String</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("Initialisatie",KlantNummer)
-]]></Implementation>
-</Method>
-
-<Method name="ModifyPrijsGeg">
-<FormalSpec>KlantNummer:%String,ProductNummer:%String,PrijsRec:%String</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ModifyPrijsGeg",KlantNummer,ProductNummer,PrijsRec)
-]]></Implementation>
-</Method>
-
-<Method name="PrijzenInclBTW">
-<FormalSpec>KLNr:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("PrijzenInclBTW",KLNr)
-]]></Implementation>
-</Method>
-
-<Method name="VoegToeProduct">
-<FormalSpec>ProductNummer:%String,CifPPL:%String="",Aantal:%String=1,TransDate:%Date</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("VoegToeProduct",ProductNummer,CifPPL,Aantal,TransDate)
-]]></Implementation>
-</Method>
-
-<Method name="VoerUit">
+<Method name="GeefPrijsVoorProducten">
+<FormalSpec>KlantNummer:%String,ProductDataLijst:%ListOfDataTypes</FormalSpec>
 <ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("VoerUit")
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefPrijsVoorProducten",KlantNummer,ProductDataLijst)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Fake/AXimpl/Admin/VKP/SalesPriceService.cls.xml
===================================================================
diff -u -r50718 -r50904
--- vhTest/Fake/AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 50718)
+++ vhTest/Fake/AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 50904)
@@ -14,6 +14,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPrijsOld">
+<FormalSpec>KlantNummer:%String,ProductNummer:%String,CifPPL:%String,Aantal:%String,TransDate:%Date</FormalSpec>
+<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrijsVoorProducten">
+<FormalSpec>KlantNummer:%String,ProductData:%ListOfDataTypes</FormalSpec>
+<ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefRequestIterator">
 <Implementation><![CDATA[]]></Implementation>
 </Method>
Index: vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/Test.cls.xml
===================================================================
diff -u -r49398 -r50904
--- vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/Test.cls.xml	(.../Test.cls.xml)	(revision 49398)
+++ vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/Test.cls.xml	(.../Test.cls.xml)	(revision 50904)
@@ -9,17 +9,24 @@
 	#dim RandomProductNummer As %String = "RandomProductNummer"
 	#dim RandomPrice As %String = "RandomPrice"
 	
-	#dim AxItemIdBepalerMock As vhTest.Mock.AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler = ##class(vhTest.Mock.AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler).%New()
-	Do AxItemIdBepalerMock.IndienMethodCall("GeefAxItemId", RandomProductNummer).DanReturn("AxProductNummer")
-	
 	#dim SalesPriceServiceMock As vhTest.Mock.AXimpl.Dynamics.SalesPriceOut.SalesPriceService = ##class(vhTest.Mock.AXimpl.Dynamics.SalesPriceOut.SalesPriceService).%New()
-	Do SalesPriceServiceMock.IndienMethodCall("getPrice", $$$ElkeWaarde).DanReturn(..GeefSalesPriceResult(RandomPrice))
+	Do SalesPriceServiceMock.VerwachtMethodCall("getPrice", $$$ElkeWaarde).DanReturn(..GeefSalesPriceResult(RandomPrice))
 	
-	#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New(SalesPriceServiceMock, "", AxItemIdBepalerMock)
+	#dim KlantIdConverterMock As vhTest.Mock.AXimpl.Utils.KlantIdConverter = ##class(vhTest.Mock.AXimpl.Utils.KlantIdConverter).%New()
+	Do KlantIdConverterMock.VerwachtMethodCall("ConvertToAx", RandomKlantNummer,  ##class(DOM.common.enu.Personality).VanHoecke()).DanReturn("RandomAxKlantNummer")
+	
+	#dim AxItemIdBepalerMock As vhTest.Mock.AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler = ##class(vhTest.Mock.AXimpl.Admin.VKP.SalesPriceService.AxItemIdBepaler).%New()
+	Do AxItemIdBepalerMock.VerwachtMethodCall("GeefAxItemId", RandomProductNummer).DanReturn("AxProductNummer")
+	
+	#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New(SalesPriceServiceMock, "", KlantIdConverterMock, AxItemIdBepalerMock)
 	#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(RandomKlantNummer, RandomProductNummer, "CifPPL")
 	#dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1)
 	
 	Do $$$AssertEquals(ResultLine.Price, RandomPrice)
+	
+	Do SalesPriceServiceMock.Verifieer()
+	Do KlantIdConverterMock.Verifieer()
+	Do AxItemIdBepalerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: KPRIJSADMIN.mac.rou
===================================================================
diff -u -r48610 -r50904
--- KPRIJSADMIN.mac.rou	(.../KPRIJSADMIN.mac.rou)	(revision 48610)
+++ KPRIJSADMIN.mac.rou	(.../KPRIJSADMIN.mac.rou)	(revision 50904)
@@ -90,34 +90,32 @@
  Set KlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KLNr)
  Set Klant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(KlantID)
  Set BusinessType = Klant.GeefBusinessType()
- Do KKORTING,CALC
  
- // VHIP907: Verkoopprijzen
- // VHIP907->MVI: voorlopig laat ik alles invullen in fase 2a en overschrijf ik enkel de waarden die ax teruggeeft
+ Do KKORTING, CALC
  
  If $$IsAX(KLNr,PRNr) {
- 	 New SalesPriceService, Result,PriceUnit
- 	 Set SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
-	 #Dim Result as AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
-	 Set Result = SalesPriceService.GeefPrijs(KLNr, PRNr, $S($G(SimPPL):SimPPL,1:""))
-	 Set VkpEUR = Result.Price
-	 Set LijstEUR = Result.GrossPrice
-	 Set PriceUnit=Result.PriceUnit
+ 	 New SalesPriceService, Result, ResultLine
+ 	 
+ 	 #dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+ 	 #dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(KLNr, PRNr, $select($get(SimPPL):SimPPL,1:""))
+ 	 #dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1)
+ 	 
+	 Set VkpEUR = ResultLine.Price
+	 Set LijstEUR = ResultLine.GrossPrice
 
-	 If SalesPriceService.PrijzenInclBTW()
-	 {
+	 If (Result.InclVAT) {
 		 Set VkpEUR=VkpEUR/1.21
 		 Set LijstEUR=LijstEUR/1.21
 	 }
 	 Set VkpPr = $J(VkpEUR,0,2)
 	 Set LijstPr = $J(LijstEUR,0,2)
-	 If Result.PriceUnit>1
-	 { 
-	 	Set VkpEUR=VkpEUR/PriceUnit
-	 	Set LijstEUR=LijstEUR/PriceUnit
-
-	}
-	 Set GrOrde=$Case(+Result.PriceUnit,100:"H",:"E")
+	 
+	 If (ResultLine.PriceUnit > 1) {
+		 Set VkpEUR = VkpEUR / ResultLine.PriceUnit
+		 Set LijstEUR = LijstEUR / ResultLine.PriceUnit
+	 }
+	 
+	 Set GrOrde = $Case(+ResultLine.PriceUnit, 100:"H", :"E")
 	 Set GrOrdNum=$Case(GrOrde,"H":100,:1)
  
 	 Set Korting2=0
@@ -270,13 +268,14 @@
  Quit R
  
 GeefLijstPrijsInAX(PRNr,SimCifPPL)
-	New Result
-	#Dim Result as AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
+	New SalesPriceService, Result, ResultLine
+	
+	#dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New()
+ 	#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs($$$KlantLVanHoecke, PRNr, .SimCifPPL)
+ 	#dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1)
+ 	
+ 	Quit ResultLine.GrossPrice 
 
-	Set Result=##class(AXimpl.Admin.VKP.SalesPriceService).%New().GeefPrijs($$$KlantLVanHoecke,PRNr,.SimCifPPL)
-	Quit Result.GrossPrice
- 
-
 GETPROD(PRNr,NoSa,SimPPL) ; Ophalen productgegevens
  New J,R,FaMunt,EenhAank,PPL,%Korting,%DB,%Cif
  Do GetProdBasis