Index: KPRIJSADMIN.mac.rou
===================================================================
diff -u -r48137 -r48147
--- KPRIJSADMIN.mac.rou	(.../KPRIJSADMIN.mac.rou)	(revision 48137)
+++ KPRIJSADMIN.mac.rou	(.../KPRIJSADMIN.mac.rou)	(revision 48147)
@@ -94,19 +94,19 @@
  
  // VHIP907: Verkoopprijzen
  // VHIP907->MVI: voorlopig laat ik alles invullen in fase 2a en overschrijf ik enkel de waarden die ax teruggeeft
- New SalesPriceService, Output, OutputLine
+ New SalesPriceService, Result
  
  If $$IsAX(KLNr,PRNr) {
  	 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):CifPPL,1:""))
+	 Set Result = SalesPriceService.GeefPrijs(KLNr, PRNr, $S($G(SimPPL):SimPPL,1:""))
 	 
 	 Set VkpEUR = Result.Price
 	 Set VkpPr = VkpEUR
 	 Set LijstEUR = Result.GrossPrice
 	 Set LijstPr = LijstEUR
 	 Set Korting2=0
-	 Set Korting1=(VkpEUR/LijstEUR-1)*100
+	 Set Korting1=(1-(VkpEUR/LijstEUR))*100
  } 
 
  Quit $$BUILD
Index: AXimpl/Admin/VKP/SalesPriceService.cls.xml
===================================================================
diff -u -r48131 -r48147
--- AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 48131)
+++ AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 48147)
@@ -19,6 +19,7 @@
 <br/>  Do SalesPriceService.VoerUit()
 <br/>  Do SalesPriceService.GeefResultaat(Reference1)
 <br/>  Do SalesPriceService.GeefResultaat(Reference2)]]></Description>
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
 <Super>TECH.Mockable</Super>
 
 <UDLText name="T">
@@ -105,23 +106,28 @@
 <FormalSpec>ProductNummer:%String,CifPPL:%String=""</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	If CifPPL="", ($$$ProductGet(ProductNummer,$$$GenProduct)?4.N)&&($$$ProductGet(ProductNummer,$$$LeveranciersNr)=$$$LevHalux)
+	{
+		Set CifPPL=$$$ProductGet(ProductNummer,$$$CifPPLEUR)
+		Set ProductNummer=$$$ProductGet(ProductNummer,$$$GenProduct)
+	}
 	Set ProdRequest =##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC).%New()
 	Set ProdRequest.MessageId = ..MessageManager.GenerateID()
 	Set ProdRequest.ItemId = ..GeefAXItemID(ProductNummer)
 	Set ProdRequest.Qty = 1
 	Set ProdRequest.SalesUnit="STK"
 	Set ProdRequest.TransDate=+$H
 	Set ProdRequest.CurrencyCode="EUR"
-	Set:CifPPL ProdRequest.CostPrice = CifPPL
+	Set:CifPPL'="" ProdRequest.CostPrice = CifPPL
 	
 	Do ..Request.Lines.Insert(ProdRequest)
-	;w ..Request.XMLExportToString(,"literal,indent")
+	Do DumpObject^%apiOBJ(ProdRequest) 
 	Quit ProdRequest.MessageId
 ]]></Implementation>
 </Method>
 
 <Method name="GeefResultaat">
-<FormalSpec>Reference</FormalSpec>
+<FormalSpec>Reference:%String</FormalSpec>
 <ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC</ReturnType>
 <Implementation><![CDATA[
 	#Dim it as TECH.Iterator=..GeefResultaatIterator()
Index: KPRIJSAX.mac.rou
===================================================================
diff -u -r48137 -r48147
--- KPRIJSAX.mac.rou	(.../KPRIJSAX.mac.rou)	(revision 48137)
+++ KPRIJSAX.mac.rou	(.../KPRIJSAX.mac.rou)	(revision 48147)
@@ -94,19 +94,19 @@
  
  // VHIP907: Verkoopprijzen
  // VHIP907->MVI: voorlopig laat ik alles invullen in fase 2a en overschrijf ik enkel de waarden die ax teruggeeft
- New SalesPriceService, Output, OutputLine
+ New SalesPriceService, Result
  
  If $$IsAX(KLNr,PRNr) {
  	 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):CifPPL,1:""))
+	 Set Result = SalesPriceService.GeefPrijs(KLNr, PRNr, $S($G(SimPPL):SimPPL,1:""))
 	 
 	 Set VkpEUR = Result.Price
 	 Set VkpPr = VkpEUR
 	 Set LijstEUR = Result.GrossPrice
 	 Set LijstPr = LijstEUR
 	 Set Korting2=0
-	 Set Korting1=(VkpEUR/LijstEUR-1)*100
+	 Set Korting1=(1-(VkpEUR/LijstEUR))*100
  } 
 
  Quit $$BUILD
Index: KPRIJS.mac.rou
===================================================================
diff -u -r48137 -r48147
--- KPRIJS.mac.rou	(.../KPRIJS.mac.rou)	(revision 48137)
+++ KPRIJS.mac.rou	(.../KPRIJS.mac.rou)	(revision 48147)
@@ -106,7 +106,7 @@
 	 Set LijstEUR = Result.GrossPrice
 	 Set LijstPr = LijstEUR
 	 Set Korting2=0
-	 Set Korting1=(VkpEUR/LijstEUR-1)*100
+	 Set Korting1=(1-(VkpEUR/LijstEUR))*100
  } 
 
  Quit $$BUILD