Index: BL/Prod/GAData/TBXLadeXML.cls.xml
===================================================================
diff -u -r433 -r549
--- BL/Prod/GAData/TBXLadeXML.cls.xml	(.../TBXLadeXML.cls.xml)	(revision 433)
+++ BL/Prod/GAData/TBXLadeXML.cls.xml	(.../TBXLadeXML.cls.xml)	(revision 549)
@@ -199,7 +199,7 @@
 	
 	Set Taal=""
 	If TBXContext.KlantGegevensViaDataOpt() Do
-	. Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(..sDomVERW,..GeefOrderKlantnummer())
+	. Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(..sDomVERW,..GeefOrderKlantnummer(), TBXContext, "")
 	. Set:($IsObject(KLMini)) Taal=KLMini.Taal
 	. Set KLMini=""
 	Else  Do
Index: csp/vhisie/TBX/Main/tmpDev.mac.rou
===================================================================
diff -u -r520 -r549
--- csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 520)
+++ csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 549)
@@ -84,7 +84,7 @@
 	. . Kill tmpRq("DATAOPT")
 	. . ;Do ophBuildSwitchTLArray   ; Once again, but with the NEW QueryString-values 
 	. Else  If (TBXContext.IsKlantIDIngevuld(KLNr))&&($G(%request.Data("Taal",1))="") Do
-	. . Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr,$LB("Stg","NoAction"))
+	. . Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr, TBXContext, $LB("Stg","NoAction"))
 	. . Set:($IsObject(KLMini))&&(KLMini.Taal?1(1"N",1"F",1"E",1"D")) Taal=KLMini.Taal
 	. . Set KLMini=""
  	Else  Do
@@ -215,11 +215,11 @@
 	Quit:($G(%request.Data("DATAOPT",1))="")
 	New KLMini,tmpTaal,msg,sDomVERW
 	Kill %OptimaMsg
-	Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),"",$LB("Ext","CleanSave"))
+	Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),"",TBXContext,$LB("Ext","CleanSave"))
 	; In case of "Bad Encryption", try getting KLData from storage
 	If '$IsObject(KLMini) Do   
 	. Set KLNr=$G(%OptimaVar("KLNr"))
-	. Set:(TBXContext.IsKlantIDIngevuld(KLNr)) KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr,$LB("Stg","NoAction"))
+	. Set:(TBXContext.IsKlantIDIngevuld(KLNr)) KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr,TBXContext,$LB("Stg","NoAction"))
 	. Set sDomVERW=TBXContext.GeefDomeinVerwerker()
 	. Set msg="WARNING : Bad encryption for "_$S(sDomVERW="LMC":"Optima",1:sDomVERW)_" customer (n� "_$G(KLNr)_")"
 	. Set msg=msg_$$$CRLF_"Ref            : "_($$ophGetRef^cspBasis.TBX.DecodeURL.tmpDev(Ref))_$$$CRLF_"Enc. Data      : "_$G(%OptimaVar("EncData"))_$$$CRLF_"Decrypted Data : "_$G(%OptimaVar("Data"))_$$$CRLF_"KLNr via Lookup: "_$G(%OptimaVar("KLNrViaLookup"))
@@ -983,7 +983,7 @@
 	New KLNaam,KLMini
 	If TBXContext.HeeftToegangMetLogin() Do
 	. Quit:($$$KLNrClean="")
-	. Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr)
+	. Set KLMini=##class(cspBasis.GAProdTBox).GetKlantData(TBXContext.GeefDomeinVerwerker(),KLNr,TBXContext)
 	. ; If KLMini Do
 	. ;.  Set KLNaam=KLMini.Naam
 	. Set:(KLMini) KLNaam=KLMini.Naam
Index: APPS/TBXWeb/TBXContext.cls.xml
===================================================================
diff -u -r548 -r549
--- APPS/TBXWeb/TBXContext.cls.xml	(.../TBXContext.cls.xml)	(revision 548)
+++ APPS/TBXWeb/TBXContext.cls.xml	(.../TBXContext.cls.xml)	(revision 549)
@@ -946,7 +946,7 @@
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[
 	If (..IsVHEPN)&&(KLNr>0) {
-		Set KLMiniWS=##class(cspBasis.GAProdTBox).GetKlantData(..GeefDomeinVerwerker(),KLNr)
+		Set KLMiniWS=##class(cspBasis.GAProdTBox).GetKlantData(..GeefDomeinVerwerker(), KLNr, %this)
 		If KLMiniWS.BulkVPKCode'="" {
 			Set lbBulkConfig=$LB(KLMiniWS.BulkVPKCode,KLMiniWS.BulkMinQty,"checked")
 		}
Index: cspBasis/GAProdTBox/tmpDev.mac.rou
===================================================================
diff -u -r320 -r549
--- cspBasis/GAProdTBox/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 320)
+++ cspBasis/GAProdTBox/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 549)
@@ -5,7 +5,7 @@
  s %request=##class(%CSP.Request).%New()
  s %request.URL="http://www.tandem-box.com/VHISIE/TBX/TestByWimV"
  s %session=##class(%CSP.Session).GetSession("1234")
- ;s kl=##class(cspBasis.GAProd.TBox).GetKlantData("VHEPN",4645)   w kl,!
+ ;s kl=##class(cspBasis.GAProd.TBox).GetKlantData("VHEPN",4645,,)   w kl,!
  ;d $system.OBJ.Dump(kl)
  Quit
  
@@ -315,3 +315,4 @@
 Product	Code	Label	SubGroepCode	element_key	Parameters	Display	VolgNr	FixedKeys	MetaItem	item.ID	param.Item	param.ID 
 	
  */
+ 
\ No newline at end of file
Index: cspBasis/GAProdTBox.cls.xml
===================================================================
diff -u -r548 -r549
--- cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 548)
+++ cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 549)
@@ -28,7 +28,7 @@
 <Description>
 Get KlantData via Soap on Cache01/ADMIN1</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>sDomVERW:%String,KLNr:%String,lbFlags:%List=""</FormalSpec>
+<FormalSpec>sDomVERW:%String,KLNr:%String,TBXContext:APPS.TBXWeb.TBXContext,lbFlags:%List=""</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <ReturnType>WS.TBX.KlantMini</ReturnType>
 <Implementation><![CDATA[
@@ -39,15 +39,14 @@
 #define smSave          "Save"
 #define smCleanSave     "CleanSave"
 	New blnVHEPN,blnLMC,blnHFLE,blnSFS,blnMBHO,blnHFLB,blnKISCH,blnRAEM,flgGetFrom,flgStorageMode,lbGetData,i,KLMini
-	; Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()   ; Of als param doorgeven 
 	Do gkdInitialize 
 	Set KLMini=""
 	For i=1:1:$LL(lbGetData) Do  Quit:($IsObject(KLMini))
 	. Do:($LG(lbGetData,i)="Stg") gkdDataFromStorage
 	. Do:($LG(lbGetData,i)="Ext") gkdDataFromExternal
 
-	If blnHFLB {
-		Do gkdDataPercentageViaSoap(sDomVERW,KLNr)
+	If TBXContext.KortingOphalenVanInterneData() {
+		Do ..VulInKortingPercentageViaSoap(.KLMini,KLNr,TBXContext,$G(DCM))
 	}
 
 	Quit KLMini
@@ -73,15 +72,6 @@
 	Set KLNr=$G(KLNr)
 	Quit
 	
-gkdDataPercentageViaSoap(sDomVERW,KLNr)
-	New DesignCode,Aantal
-	If $IsObject(KLMini) {
-		Set DesignCode=$G(DCM)
-		Set Aantal=1
-		Set KLMini.Korting=""
-		Set KLMini.Korting=##class(cspBasis.GAProdTBox).GeefKortingPercentageTBX(sDomVERW,KLNr,DesignCode,Aantal)
-	}
-	Quit
 gkdDataFromStorage
  ;  Deze macro's zijn in commentaar gezet door WimV op 14/12/2010 
  ;	#define SepData      "\"
@@ -210,6 +200,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VulInKortingPercentageViaSoap">
+<Description>
+KLMini-object wordt ingevuld. </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>KLMini:WS.TBX.KlantMini,KLNr:%String,TBXContext:APPS.TBXWeb.TBXContext,DesignCodeModus:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If $IsObject(KLMini) {
+		Set Aantal=1
+		Set KLMini.Korting=""
+		Set KLMini.Korting=##class(cspBasis.GAProdTBox).GeefKortingPercentageTBX(TBXContext.GeefDomeinVerwerker(),KLNr,DesignCodeModus,Aantal)
+	}
+	Quit
+]]></Implementation>
+</Method>
+
 <Method name="GetOptimaFixKLNr">
 <Description>
 Lookup for Optima KLNr via encrypted DATA-ref.
@@ -380,7 +386,7 @@
 		Set Familie="Lade"
 		Set Variant=##class(APPS.TBXWeb.Utils).GeefLadeVariant(DesignCodeModus)
 		Set KortingPercentage=$$GeefKortingPercentageViaSoap(DomeinVerwerker,KlantNummer,Familie,Variant,Aantal)
-		  d WLIP^vhDBG(97,"GeefKortingPercentage : "_KortingPercentage_"  voor Klant "_KlantNummer_"  DCM:"_DesignCodeModus_"  Variant:"_Variant)
+		  ;d WLIP^vhDBG(97,"GeefKortingPercentage : "_KortingPercentage_"  voor Klant "_KlantNummer_"  DCM:"_DesignCodeModus_"  Variant:"_Variant)
 	}
 	Quit KortingPercentage
 	
Index: csp/vhisie/TBX/BuildRef/tmpDev.mac.rou
===================================================================
diff -u -r531 -r549
--- csp/vhisie/TBX/BuildRef/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 531)
+++ csp/vhisie/TBX/BuildRef/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 549)
@@ -229,12 +229,13 @@
 #define TaalDfl          "F"
 	  s:('$D(ClientIP)) ClientIP="192.168.1.97"
 	  ;d WL^vhDBG($C(13,10))
-	New Ref,RefNew,RefArray,tmpRq,tmpAr,tmpTaal
+	New Ref,RefNew,RefArray,tmpRq,tmpAr,tmpTaal,TBXContext
 	Set %RemoteIP=$G(%request.CgiEnvs("REMOTE_ADDR"))
 	Do ophInitLookups^cspBasis.TBX.DecodeURL.tmpDev
 	//   URL --> domain / sDomVERW / sDomKLNr
 	Set sDomain=$$GetURLDomain^cspBasis.Library
 	Set sDomCVT="www.optima-tbx.fr"   ; $$TBXDomainCVT^cspBasis.Library(sDomain)
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).%New(sDomCVT,"")
 	Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))
 	Set sDomVERW=$LG(lbDomLU,1)
 	Set sDomKLNr=$LG(lbDomLU,2)
@@ -267,7 +268,7 @@
 	. Kill tmpAr
     . If blnEditFind Do
 	. . ; Show stored data
-	. . Set:($IsValidNum(KLNrOpt)) KLMini=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,KLNrOpt,$LB("Stg","NoAction"))
+	. . Set:($IsValidNum(KLNrOpt)) KLMini=##class(cspBasis.GAProdTBox).GetKlantData(sDomVERW,KLNrOpt,TBXContext,$LB("Stg","NoAction"))
 	. . If $IsObject($G(KLMini)) Do
 	. . . Set tmpAr("Taal")= KLMini.Taal
 	. . . Set tmpAr("KLNummer")=KLMini.Nummer