Index: AXimpl/Admin/VKP/SalesPriceService.cls.xml
===================================================================
diff -u -r50704 -r50877
--- AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 50704)
+++ AXimpl/Admin/VKP/SalesPriceService.cls.xml	(.../SalesPriceService.cls.xml)	(revision 50877)
@@ -22,25 +22,6 @@
 <IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
 <Super>TECH.Mockable</Super>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-s rc = ##class(TECH.Context.RuntimeContext).Instance()
-s ci = ##class(TECH.Config.ConfigMgr).Instance()
-
-d ci.ZetString("AX_FASE","2A") ; default voor iedereen
-d ci.ZetString("AX_FASE","2A","PrijsViaAX")
-d ci.ZetString("AX_FASE","1","PrijsZonderAX")
-
-d rc.ZetApplicatie("AX_FASE","PrijsZonderAX")
-w ci.GeefString("AX_FASE") -> 1
-d rc.ZetApplicatie("AX_FASE")
-w ci.GeefString("AX_FASE") -> 2A
-
-*/
-]]></Content>
-</UDLText>
-
 <Property name="MessageManager">
 <Type>AXimpl.MessageManager</Type>
 <Private>1</Private>
@@ -68,9 +49,7 @@
 
 <Method name="ModifyPrijsGeg">
 <FormalSpec>KlantNummer:%String,ProductNummer:%String,PrijsRec:%String</FormalSpec>
-<Implementation><![CDATA[
-	;Do ..GeefPrijs()
-	Quit PrijsRec
+<Implementation><![CDATA[	Quit PrijsRec
 ]]></Implementation>
 </Method>
 
@@ -82,19 +61,19 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..SalesPriceService = $$$Inject(SalesPriceService, ##class(AXimpl.Dynamics.SalesPriceOut.SalesPriceService).%New())
-	;d DumpObject^%apiOBJ(..SalesPriceService)
 	Set ..SalesPriceService.Timeout = 10
-	;Set ..SalesPriceService=##class(RoutingService.zGetPrice.BasicHttpBindingADUSalesPriceService).%New()
+	
 	Set ..MessageManager = $$$Inject(MessageManager, ##class(AXimpl.MessageManager).%New())
 	Set ..SoprConvertor = ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Initialisatie">
 <FormalSpec>KlantNummer:%String</FormalSpec>
 <Implementation><![CDATA[
-	Set ..Request  = ##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC).%New()
+	Set ..Request = ##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceHeaderInputDC).%New()
 	
 	Set ..Request.CustAccount = ..GeefAXCustomerID(KlantNummer)
 	Set ..Request.CalcPrice = $$$True
@@ -107,24 +86,24 @@
 <FormalSpec>ProductNummer:%String,CifPPL:%String="",Aantal:%String=1,TransDate:%Date</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If CifPPL="", ($$$ProductGet(ProductNummer,$$$GenProduct)?4.N)&&((";"_$$$LevHalux_";"_$$$LevVanHoecke_";")[(";"_$$$ProductGet(ProductNummer,$$$LeveranciersNr)_";"))
-	{
+	If CifPPL="", ($$$ProductGet(ProductNummer,$$$GenProduct)?4.N)&&((";"_$$$LevHalux_";"_$$$LevVanHoecke_";")[(";"_$$$ProductGet(ProductNummer,$$$LeveranciersNr)_";")) {
 		Set CifPPL=$$$ProductGet(ProductNummer,$$$CifPPLEUR)
 		Set ProductNummer=$$$ProductGet(ProductNummer,$$$GenProduct)
 	}
-	If CifPPL="",$$IsOrgaluxOpMaat^PRODUKT2(ProductNummer)
-	{
+	
+	If CifPPL="",$$IsOrgaluxOpMaat^PRODUKT2(ProductNummer) {
 		Set CifPPL=$$$ProductGet(ProductNummer,$$$CifPPLEUR)
 		Set ProductNummer=1804877 ; GEN.ORGALUX INGEKORT  XXX
 	}
-	Set ProdRequest =##class(AXif.Dynamics.SalesPriceOut.MessageParts.ADUSalesPriceLineInputDC).%New()
+	
+	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=$S($G(TransDate):+TransDate,1:+$H)
-	Set ProdRequest.CurrencyCode="EUR"
-	Set:CifPPL'="" ProdRequest.CostPrice = +$J(CifPPL,0,2)
+	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
@@ -135,14 +114,16 @@
 <FormalSpec>Reference:%String</FormalSpec>
 <ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC</ReturnType>
 <Implementation><![CDATA[
-	#Dim it as TECH.Iterator=..GeefResultaatIterator()
-	Set Found=0
-	While it.HasNext()&&'Found
-	{
-		Set Result=it.Next()
-		Set:(Reference=("{"_$ZCVT(Result.MessageId,"U")_"}")) Found=1
+	#dim Iterator As TECH.Iterator = ..GeefResultaatIterator()
+	#dim Found As %Boolean = $$$False
+	#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC
+	
+	While (Iterator.HasNext() && $$$Not(Found)) {
+		Set Result = Iterator.Next()
+		Set:(Reference = ("{" _ $ZCONVERT(Result.MessageId,"U") _ "}")) Found = $$$True
 	}
-	Quit $S(Found:Result,1:"")
+
+	Quit $SELECT(Found:Result,1:"")
 ]]></Implementation>
 </Method>
 
@@ -158,19 +139,16 @@
 
 <Method name="VoerUit">
 <ReturnType>AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC</ReturnType>
-<Implementation><![CDATA[
-	;Quit:##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_FASE")="2A"
-	Set ..Result=..SalesPriceService.getPrice(..Request)
+<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)
-	Set Reference=..VoegToeProduct(ProductNummer, .CifPPL, .Aantal,.TransDate)
+	#dim Reference As %String = ..VoegToeProduct(ProductNummer, .CifPPL, .Aantal,.TransDate)
 	Do ..VoerUit()
 	Quit ..GeefResultaat(Reference)
 ]]></Implementation>
@@ -181,26 +159,27 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct = ..SoprConvertor.AdminNaarAx(PRNr)
 	
-	#dim AxProduct As AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct
-	Set AxProduct=..SoprConvertor.AdminNaarAx(PRNr)
-	If $IsObject(AxProduct),AxProduct.IsSoprInCache
-	{
-		Set PRNr=AxProduct.VervangSoprPRNr
+	If $ISOBJECT(AxProduct),AxProduct.IsSoprInCache {
+		Set PRNr = AxProduct.VervangSoprPRNr
 	}
-	Quit $P(^KPR(PRNr,2),"\",25) ; Identnummer
+	
+	Quit $PIECE(^KPR(PRNr,2),"\",25) ; Identnummer
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAXCustomerID">
 <FormalSpec>KLNr:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $S($L(KLNr)<5:"0",1:"")_KLNr
+<Implementation><![CDATA[	Quit $SELECT($LENGTH(KLNr)<5:"0",1:"")_KLNr
 ]]></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