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