Index: TECH/Percentage.cls.xml
===================================================================
diff -u
--- TECH/Percentage.cls.xml	(revision 0)
+++ TECH/Percentage.cls.xml	(revision 548)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="TECH.Percentage">
+<ClassType>datatype</ClassType>
+<OdbcType>DOUBLE</OdbcType>
+<SqlCategory>DOUBLE</SqlCategory>
+<Super>%String</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+</Class>
+</Export>
Index: APPS/TBXWeb/TBXContext.cls.xml
===================================================================
diff -u -r537 -r548
--- APPS/TBXWeb/TBXContext.cls.xml	(.../TBXContext.cls.xml)	(revision 537)
+++ APPS/TBXWeb/TBXContext.cls.xml	(.../TBXContext.cls.xml)	(revision 548)
@@ -837,6 +837,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="KortingOphalenVanInterneData">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..DomeinVerwerker?1(1"HFLB")
+]]></Implementation>
+</Method>
+
 <Method name="ToonVeldenPDataExtraInWizard">
 <Description>
 Contactgegevens van de klant in stap 1 (PData) van de Wizard. 
Index: WS/TBX/DataIOSoap.cls.xml
===================================================================
diff -u -r335 -r548
--- WS/TBX/DataIOSoap.cls.xml	(.../DataIOSoap.cls.xml)	(revision 335)
+++ WS/TBX/DataIOSoap.cls.xml	(.../DataIOSoap.cls.xml)	(revision 548)
@@ -67,6 +67,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GetKortingPercentageTBXHandel">
+<Final>1</Final>
+<FormalSpec>DomeinVerwerker:APPS.TBXWeb.enu.TBXHandel,KlantNummer:%String,Familie:DOM.PM.enu.Familie,Variant:DOM.PM.enu.Variant,Aantal:%Integer</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>TECH.Percentage</ReturnType>
+<WebMethod>1</WebMethod>
+<SoapBindingStyle>document</SoapBindingStyle>
+<SoapBodyUse>literal</SoapBodyUse>
+<Implementation><![CDATA[ Quit ..WebMethod("GetKortingPercentageTBXHandel").Invoke(##this,"http://tempuri.org/WS.TBX.DataIO.GetKortingPercentageTBXHandel",.DomeinVerwerker,.KlantNummer,.Familie,.Variant,.Aantal)
+]]></Implementation>
+</Method>
+
 <Method name="GetEmailAdressen">
 <Final>1</Final>
 <FormalSpec>KLNr:%String,ListSep:%String=";"</FormalSpec>
Index: DOM/PM/enu/Variant.cls.xml
===================================================================
diff -u -r31 -r548
--- DOM/PM/enu/Variant.cls.xml	(.../Variant.cls.xml)	(revision 31)
+++ DOM/PM/enu/Variant.cls.xml	(.../Variant.cls.xml)	(revision 548)
@@ -7,11 +7,11 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="VALUELIST">
-<Default>,TBX_Plus,TBX_Antaro,TBX_Intivo,TBX_Baliko,TBX_Mengvorm,Basis,MDS,OLM,TAOO</Default>
+<Default>,TBX_Plus,TBX_Antaro,TBX_Intivo,TBX_Baliko,TBX_Mengvorm,Basis,MDS,OLM,TAOR,LBX_Pure</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>,TANDEMBOX plus,TANDEMBOX antaro,TANDEMBOX intivo,TANDEMBOX baliko,TANDEMBOX mengvorm,Basis,MDS,ORGALUX op maat,The Art Of Organization</Default>
+<Default>,TANDEMBOX plus,TANDEMBOX antaro,TANDEMBOX intivo,TANDEMBOX baliko,TANDEMBOX mengvorm,Basis,MDS,ORGALUX op maat,TA'OR BOX,LEGRABOX pure</Default>
 </Parameter>
 </Class>
 </Export>
Index: APPS/TBXWeb/Utils.cls.xml
===================================================================
diff -u -r523 -r548
--- APPS/TBXWeb/Utils.cls.xml	(.../Utils.cls.xml)	(revision 523)
+++ APPS/TBXWeb/Utils.cls.xml	(.../Utils.cls.xml)	(revision 548)
@@ -249,5 +249,15 @@
 	Quit Cnt
 ]]></Implementation>
 </Method>
+
+<Method name="GeefLadeVariant">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>DesignCodeModus:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Case(DesignCodeModus, "S":"TBX_Plus", "F":"TBX_Plus", "A":"TBX_Antaro", "I":"TBX_Intivo", "MA":"TBX_Mengvorm", "LBX_Pure":"LBX_Pure", :"TBX_Plus")
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: cspBasis/GAProdTBox.cls.xml
===================================================================
diff -u -r531 -r548
--- cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 531)
+++ cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 548)
@@ -45,6 +45,11 @@
 	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)
+	}
+
 	Quit KLMini
 gkdInitialize
 	Set blnVHEPN=(sDomVERW=##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke())
@@ -67,6 +72,16 @@
 	Set lbGetData=$$PiecesToList^vhLib(flgGetFrom,";")   ;$CASE(flgGetFrom, "Ext":$LB("Ext"), "Stg":$LB("Stg"), "Stg;Ext":$LB("Stg","Ext"), "Ext;Stg":$LB("Ext","Stg"), :"")
 	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      "\"
@@ -284,7 +299,7 @@
 	Set $ZTRAP="geaSoapErrorLW"
 	Set lbEmails=Client.GetEmailAdressenLB(KLNr)
 	Set $ZTRAP=""
-	Quit $G(lbEmails)
+	Quit
 
 geaSoapAddToLog2
 	New lbExtras
@@ -351,6 +366,58 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKortingPercentageTBX">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>DomeinVerwerker:APPS.TBXWeb.enu.TBXHandel,KlantNummer:%String,DesignCodeModus:%String,Aantal:%Integer</FormalSpec>
+<ProcedureBlock>0</ProcedureBlock>
+<ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[
+	New KortingPercentage,Familie,Variant
+	If DomeinVerwerker="VHEPN" {
+		Set KortingPercentage=ERROR   ; GetKortingPercentageTBXHandel() is niet van toepassing voor VHEPN 
+	}
+	Else {
+		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)
+	}
+	Quit KortingPercentage
+	
+GeefKortingPercentageViaSoap(DomeinVerwerker,KlantNummer,Familie,Variant,Aantal)
+	New KortingPercentage
+	Do GeefKortingPercentageViaSoapSub("WS.TBX.DataIOSoap","GetKortingPercentageTBXHandel")
+	Quit $G(KortingPercentage)
+
+GeefKortingPercentageViaSoapSub(SoapClass,method)
+	New Client,Result,lbLocations,locNdx
+	Set Client=$System.OBJ.New(SoapClass)
+	Set Result=Client.PrepareGetKlant(.lbLocations,.locNdx)   ; Uses PeekServer  and  TimeOut=(120-1)sec
+	  //d WLIP^vhDBG(195,"PeekServer (PrepareBuildWS) finished ==>  locNdx="_$G(locNdx)_" "_$$$LCVT(lbLocations))
+	Do:(locNdx<0) gkpSoapAddToLog   ; Problem: no location
+	Quit:('Result)
+	Do:(locNdx>1) gkpSoapAddToLog   ; Not the first location
+	Set $ZTRAP="gkpSoapErrorLW"
+	Set KortingPercentage=Client.GetKortingPercentageTBXHandel(DomeinVerwerker,KlantNummer,Familie,Variant,Aantal)
+	Set $ZTRAP=""
+	Quit
+
+gkpSoapAddToLog
+	New lbExtras
+	Set lbExtras=$$PeekSOAPBuildLog^cspBasis.SOAPlib(SoapClass,method,lbLocations,locNdx)
+	Do ##class(cspBasis.GAProdTBox).AddToLog("SOAP_BACKUP",$G(%session.Data("DOMAIN")),$G(%session.Data("KLNR")),$G(%session.Data("MODE")),wsID,$G(%session.Data("VERW")),$G(Taal),,lbExtras)
+	Quit	
+ 
+gkpSoapErrorLW
+	Set $ZTRAP=""
+	New CustomMsg
+	Set CustomMsg=SoapClass_" - "_method_"() : KLNr"_$G(KLNr)_"."_$S(locNdx>1:"  ["_$LG(lbLocations,locNdx)_"]" ,1:"")
+	Do SOAPErrorMail^cspBasis.SOAPlib("TBX_ERR",,CustomMsg,,Client)
+	Set KLMini=""
+	Quit
+]]></Implementation>
+</Method>
+
 <Method name="GetKlantBulk">
 <Description>
 Get Bulk settings from global, specifiek voor KLNr
Index: DOM/PM/enu/Familie.cls.xml
===================================================================
diff -u
--- DOM/PM/enu/Familie.cls.xml	(revision 0)
+++ DOM/PM/enu/Familie.cls.xml	(revision 548)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.PM.enu.Familie">
+<ClassType>datatype</ClassType>
+<Super>%String</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="VALUELIST">
+<Default>,Lade,AluKader,Orgalux,Mat</Default>
+</Parameter>
+
+<Parameter name="DISPLAYLIST">
+<Default>,Lade,Aluminium kaderdeur,ORGALUX,Mat</Default>
+</Parameter>
+</Class>
+</Export>