Index: APPS/TBXWeb/OrderChecker.cls.xml
===================================================================
diff -u -r2 -r22
--- APPS/TBXWeb/OrderChecker.cls.xml	(.../OrderChecker.cls.xml)	(revision 2)
+++ APPS/TBXWeb/OrderChecker.cls.xml	(.../OrderChecker.cls.xml)	(revision 22)
@@ -54,21 +54,24 @@
 	Set Source="TBoxWeb"
 
 	Set BodyIsStream=1
-	Set BodyIsHTML=0
+	Set BodyIsHTML=1
 	
 	Set Subject="Verzonden TBX-orders niet verwerkt"_$S($L(Source):" ("_Source_")", 1:"")
 	Set From=$$$SystemMail("TBX OrderChecker")
 	Set lbTo=$$PiecesToList^vhLib(##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.TBXWeb.OrderChecker_MailTo"),";")
 	Set BodyStream = ##class(%Library.GlobalCharacterStream).%New()
 	Do BodyStream.WriteLine("Volgende orders werden nog niet verwerkt via Tandembox website: ")
-	Do BodyStream.WriteLine()
+	Do BodyStream.WriteLine("<BR>")
 	
 	If $D(TabelArray) {
 		Set TabelStream=$$ArrayToHTMLTable^vhLib(.TabelArray)
 		Set sc=BodyStream.CopyFrom(TabelStream)
-		Set BodyIsHTML=1
 	}
 	
+	Do BodyStream.WriteLine("<BR><BR>")
+	Do BodyStream.WriteLine($$$Replace($$GetJobInfo^vhLib.System(),$$$CRLF,"<BR>"))
+	Do BodyStream.WriteLine("<BR>")
+
 	Set sc=$$SendMiniMail^vhLib(From,lbTo,Subject,BodyStream,BodyIsStream,BodyIsHTML)
 	Quit sc
 ]]></Implementation>
Index: cspBasis/SOAPlib.mac.rou
===================================================================
diff -u -r2 -r22
--- cspBasis/SOAPlib.mac.rou	(.../SOAPlib.mac.rou)	(revision 2)
+++ cspBasis/SOAPlib.mac.rou	(.../SOAPlib.mac.rou)	(revision 22)
@@ -109,6 +109,17 @@
 	..  ;Set tmpLB=tmpLB_$LB(tmpAr(Serv,NSpace))
 	. Else  Do
 	..  Do glcAddLoc($G(tmpAr(Serv,NSpace)))   ; Conditional Set tmpLB=tmpLB_$LB(tmpAr(Serv,NSpace))
+	
+	// Added by WimV on 06/06/2011 
+	// Voor ondersteuning WSLocations naar lokale cach�-server
+	If ($LL(lbWSlocs)'<1)&&($LG(tmpLB,1)="") {
+		Set tmpLB=""
+		Do glcAddLoc($G(tmpAr("ConfigItem_Prod")))
+	}
+	If ($LL(lbWSlocs)'<2)&&($LG(tmpLB,2)="") {
+		Do glcAddLoc($G(tmpAr("ConfigItem_ProdFailOver")))
+	}
+	
 	Quit tmpLB
 glcAddLoc(loc)
 	Set:($LF(tmpLB,loc)<1) tmpLB=tmpLB_$LB(loc)
@@ -136,7 +147,19 @@
 	Set arLocations("WS.PR.KADWebSoap","cache01","ADMIN1")      =ProductieWebServiceLocation_"WS.PR.KADWeb.cls"
 	Set arLocations("WS.PR.KADWebSoap","cache02","JRNL-ADMIN1") =ProductieFailoverWebServiceLocation_"WS.PR.KADWeb.cls"
 	Set arLocations("WS.PR.KADWebSoap","cache02","DEV-ADMIN1")  =DevelopmentWebServiceLocation_"WS.PR.KADWeb.cls"
+	
  
+	// Added by WimV on 06/06/2011 
+	// Voor ondersteuning WSLocations naar lokale cach�-server
+	Set arLocations("WS.TBX.CalcSoap","ConfigItem_Prod")          =ProductieWebServiceLocation_"WS.TBX.Calc.cls"
+	Set arLocations("WS.TBX.CalcSoap","ConfigItem_ProdFailOver")  =ProductieFailoverWebServiceLocation_"WS.TBX.Calc.cls"
+	Set arLocations("WS.TBX.DataIOSoap","ConfigItem_Prod")        =ProductieWebServiceLocation_"WS.TBX.DataIO.cls"
+	Set arLocations("WS.TBX.DataIOSoap","ConfigItem_ProdFailOver")=ProductieFailoverWebServiceLocation_"WS.TBX.DataIO.cls"
+	Set arLocations("WS.PR.KADWebSoap","ConfigItem_Prod")         =ProductieWebServiceLocation_"WS.PR.KADWeb.cls"
+	Set arLocations("WS.PR.KADWebSoap","ConfigItem_ProdFailOver") =ProductieFailoverWebServiceLocation_"WS.PR.KADWeb.cls"
+	Set arLocations("WS.EC.WebShopClient","ConfigItem_Prod")         =ProductieWebServiceLocation_"WS.EC.WebShopServer.cls"
+	Set arLocations("WS.EC.WebShopClient","ConfigItem_ProdFailOver") =ProductieFailoverWebServiceLocation_"WS.EC.WebShopServer.cls"
+ 
 	/*
 	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("x_x_x_IsInDMZ")) { 
 		Set arLocations("WS.TBX.CalcSoap","cache01","ADMIN1")       ="http://195.130.157.5:88/csp/admin1/WS.TBX.Calc.cls"
Index: csp/vhisie/TBX/MailResult/tmpDev.mac.rou
===================================================================
diff -u -r2 -r22
--- csp/vhisie/TBX/MailResult/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 2)
+++ csp/vhisie/TBX/MailResult/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 22)
@@ -35,7 +35,7 @@
 	If $L(PageDomain)&&$L(WSOrd.WebDomain)&&(WSOrd.WebDomain'=PageDomain) Do  Quit
 	. Set errmsg = "The domain does not match the corresponding value in the order."
 	// Else: 
-	Set OrderbevEmail=$G(%request.Data("EMAILORDERBEVESTIGING",1)) 
+	Set OrderbevEmail=$G(%request.Data("EMAILORDERBEVESTIGING",1))
 	Set LevTOms=$G(%request.Data("LEVERTIJD",1))
 	Set LevDatum=$G(%request.Data("LEVERTIJDID",1))
 	Set:($IsValidNum(LevDatum)) LevTOms=$$$Replace(LevTOms,"?"," ")                              ; Added by WimV on 13/01/2010  - reason: Form submit converts &nbsp; and "�"-characters to "?" 
@@ -48,7 +48,7 @@
 	Set:($L(sComments)) WSOrd.Opmerking1=sComments
 	Set sc=WSOrd.%Save()
 	Set blnOFFToBBON=(WSOrd.BonType="OFF")&&($G(%request.Data("OFFTOBBON",1))=1)
-	Set blnViaNewImplementation=(sDomVERW?1(1"SFS",1"MBHO"))   ; SFS en MBHolland gebruiken de nieuwe implementatie van APPS.TBXWeb.OrderHandling 
+	Set blnViaNewImplementation=(sDomVERW?1(1"SFS",1"MBHO",1"HFLB"))   ; SFS en MBHolland gebruiken de nieuwe implementatie van APPS.TBXWeb.OrderHandling 
 	If (blnOFFToBBON)&&('blnViaNewImplementation) Do   ; Status OFF change to BBON
 	. Set WSOrd.BonType="BBON"
 	
@@ -72,6 +72,8 @@
 	. Do tsmMailFldsSFS
 	Else  If sDomVERW="MBHO" Do
 	. ;Do tsmMailFldsMBHO
+	Else  If sDomVERW="HFLB" Do
+	. ;Do tsmMailFldsHFLB
 	Else  Do
 	. Do tsmMailFldsVHEPN
 	Set BodyIsStream=0
@@ -291,7 +293,11 @@
 	$$$ThrowError($$$errGeneralError,"OrderHandling via Old method is disabled. OrderHandling must use new implementation.")
 	Quit
  
+tsmMailFldsHFLB
+	$$$ThrowError($$$errGeneralError,"OrderHandling via Old method is disabled. OrderHandling must use new implementation.")
+	Quit
  
+ 
 tsmMailFldsVHEPN
 	;Set From=$S($$$EMailValid(WSOrd.KLEMail):$S($L(WSOrd.KLNaam):""""_WSOrd.KLNaam_""" ", 1:"")_"<"_WSOrd.KLEMail_">", 1:""""_$S($L(WSOrd.KLNaam):WSOrd.KLNaam, 1:"Anonymous")_""" <AdminTBX@vanhoecke.be>")
     Set From=""""_$S($L(WSOrd.KLNaam):WSOrd.KLNaam, 1:"Anonymous")_""" <"_$$$EMailFrom2Any_">"
@@ -431,6 +437,8 @@
     . Do tsmMailFldsSFS
     Else  If sDomVERW="MBHO" Do
     . Do tsmMailFldsMBHO
+    Else  If sDomVERW="HFLB" Do
+    . Do tsmMailFldsHFLB
     Else  Do
     . Do tsmMailFldsVHEPN
 	Set BodyIsStream=0
Index: csp/errorvh.cls.xml
===================================================================
diff -u -r2 -r22
--- csp/errorvh.cls.xml	(.../errorvh.cls.xml)	(revision 2)
+++ csp/errorvh.cls.xml	(.../errorvh.cls.xml)	(revision 22)
@@ -441,11 +441,11 @@
 	. Set Body=""
 	Else  Do ; Nothing.  Use values as passed by lbArgs
 
-#If ($ZCVT($ZUTIL(110),"U")'["WWW")
+#If (##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()="DEV")
 	Do   ; Send to SoapSysOp only on WWW;  else replace by "WV"
 	. New i
 	. Set i=$LF(lbTo,"ICT_SOAPSysOp@vanhoecke.be")
-	. Set:(i>0) $LI(lbTo,i)="wv@vanhoecke.be"
+	. Set:(i>0) $LI(lbTo,i)=$S($G(%RemoteIP)="192.168.1.195":"jcl@vanhoecke.be",1:"wv@vanhoecke.be")
 #EndIf
 	; Send E-mail
  	If $IsObject($G(tmpStream)) Do
Index: Prod/Kenmerk/BT/RootDir.cls.xml
===================================================================
diff -u -r2 -r22
--- Prod/Kenmerk/BT/RootDir.cls.xml	(.../RootDir.cls.xml)	(revision 2)
+++ Prod/Kenmerk/BT/RootDir.cls.xml	(.../RootDir.cls.xml)	(revision 22)
@@ -23,7 +23,7 @@
 
 <Property name="ToepasType">
 <Type>%Library.String</Type>
-<Parameter name="VALUELIST" value=";WWW;FTP;INTERN;FOP;FLEX"/>
+<Parameter name="VALUELIST" value=";WWW;WWWOL;FTP;INTERN;FOP;FLEX;BARTENDER"/>
 </Property>
 
 <Index name="PrimaryIndex">
@@ -39,7 +39,8 @@
 <ReturnType>%Library.String</ReturnType>
 <Implementation><![CDATA[
  Quit:($G(DirCode)="") ""
- New ID
+ New ID,UseWildCards
+ Set UseWildCards=1
  Set ID=$$bmBuildID
  Quit:(##class(Prod.Kenmerk.BT.RootDir).%ExistsId(ID)) ID	
  Set ID=$S($G(UseWildCards):$$bmWildCardID, 1:"")
Index: DW/WWW/SysLogTBX.cls.xml
===================================================================
diff -u -r2 -r22
--- DW/WWW/SysLogTBX.cls.xml	(.../SysLogTBX.cls.xml)	(revision 2)
+++ DW/WWW/SysLogTBX.cls.xml	(.../SysLogTBX.cls.xml)	(revision 22)
@@ -203,18 +203,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Domein:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-#define DomVHEPN     $$$TBoxWebDomeinVHEPN
-#define DomHEIN      $$$TBoxWebDomeinHEIN
-#define DomOPTIMA    $$$TBoxWebDomeinOPTIMA
-#define DomDUPONT    $$$TBoxWebDomeinDUPONT
-#define DomHELMY     $$$TBoxWebDomeinHELMY
-#define DomHFLE      $$$TBoxWebDomeinHFLE
-#define DomSFS       $$$TBoxWebDomeinSFS
-#define DomMBHO      $$$TBoxWebDomeinMBHO
-#define DomDEMO      $$$TBoxWebDomeinDEMO
-
- Quit $CASE(Domein, $$$DomVHEPN:"vh", $$$DomHEIN:"hein", $$$DomOPTIMA:"optima", $$$DomDUPONT:"dupont", $$$DomHELMY:"destil", $$$DomHFLE:"hafele", $$$DomSFS:"sfs", $$$DomMBHO:"mbho", $$$DomDEMO:"demo", :Domein)
+<Implementation><![CDATA[	Quit ##class(APPS.TBXWeb.TBXContext).GeefDomeinKort(Domein)
 ]]></Implementation>
 </Method>
 
Index: cspBasis/GAProdTBox.cls.xml
===================================================================
diff -u -r2 -r22
--- cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 2)
+++ cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 22)
@@ -44,7 +44,7 @@
 #define smCleanSave     "CleanSave"
 	  ;s:('$D(%ClientIP)) %ClientIP="192.168.1.97"
 	  ;d WLIP^vhDBG(97,$G(sDomVERW)_" - "_$G(KLNr)_" - "_$$$LCVT(lbFlags))
-	New blnVHEPN,blnLMC,blnHFLE,blnSFS,blnMBHO,flgGetFrom,flgStorageMode,lbGetData,i,KLMini
+	New blnVHEPN,blnLMC,blnHFLE,blnSFS,blnMBHO,blnHFLB,flgGetFrom,flgStorageMode,lbGetData,i,KLMini
 	Do gkdInitialize 
 	Set KLMini=""
 	For i=1:1:$LL(lbGetData) Do  Quit:($IsObject(KLMini))
@@ -57,6 +57,7 @@
 	Set blnHFLE=(sDomVERW="HFLE")
 	Set blnSFS=(sDomVERW="SFS")
 	Set blnMBHO=(sDomVERW="MBHO")
+	Set blnHFLB=(sDomVERW="HFLB")
 	If blnVHEPN Do
 	. Set flgGetFrom=$LG(lbFlags,$$$liGetFrom,"Ext")
 	. Set flgStorageMode=$LG(lbFlags,$$$liStorageMode,$$$smNoAction)
@@ -78,7 +79,7 @@
 	Set KLData=$G($$$GlobalKLData(sDomVERW,KLNr))
 	Quit:(KLData="")
 	; Else 
-	If blnLMC||blnSFS||blnMBHO Do
+	If blnLMC||blnSFS||blnMBHO||blnHFLB Do
 	. Do OPTIMAAnalyseData^cspBasis.TBX.DecodeURL.tmpDev(KLData,.tmpAr)   ; Analyse only, KLData already decrypted
 	. Set KLMini=##class(WS.TBX.KlantMini).%New()
 	. Set KLMini.Taal  =$G(tmpAr("Taal"))
@@ -95,7 +96,7 @@
 	Quit 
 gkdDataFromExternal
 	New KLData
-	If blnLMC||blnSFS||blnMBHO Do
+	If blnLMC||blnSFS||blnMBHO||blnHFLB Do
 	. Set KLMini=$$GetKlantDataViaQS(.KLData)
 	. Set:(KLMini) KLNr=KLMini.Nummer
 	Else  If blnVHEPN Do
@@ -112,7 +113,7 @@
 	Quit:(flgStorageMode=$$$smClean)
 	Quit:('$IsObject(KLMini))
 	; Else : Save the data
-	If blnLMC||blnSFS||blnMBHO Do
+	If blnLMC||blnSFS||blnMBHO||blnHFLB Do
 	. Set $$$GlobalKLData(sDomVERW,KLNr)=KLData
 	Quit
 
@@ -134,6 +135,10 @@
 	. Set Data=$G(%request.Data("DATAOPT",1))
 	. Set Data=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(Data,.tmpAr,"MBHO")
 	. Quit:(Data="")
+	If blnHFLB Do
+	. Set Data=$G(%request.Data("DATAOPT",1))
+	. Set Data=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(Data,.tmpAr,"HFLB")
+	. Quit:(Data="")
 	If Data'="" Do
 	. Set KLMini=##class(WS.TBX.KlantMini).%New()
 	. Set KLMini.Taal  =$$$ReplaceBackQuote($G(tmpAr("Taal")))
@@ -1005,14 +1010,18 @@
 <FormalSpec><![CDATA[&arConfig:%String]]></FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-#define TaalDfl   $S(sDomVERW="HEIN":"D", sDomVERW="LMC":"F", sDomVERW="SFS":"D", 1:"N")
-	//   URL --> domain / sDomVERW / sDomKLNr
-	Set sDomain=$$GetURLDomain^cspBasis.Library
-	Set sDomCVT=$$TBXDomainCVT^cspBasis.Library(sDomain)
-	Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))
-	Set sDomVERW=$LG(lbDomLU,1)
-	Set sDomKLNr=$LG(lbDomLU,2)
-	Set Taal=$$$TaalDfl
+	// Modified by WimV on 23/06/2011 : 
+	// Implementatie met TBXContext-object   i.p.v. ##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	Set sDomCVT=TBXContext.GeefWebDomein()
+ ;	Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	Set Taal=TBXContext.GeefDefaultTaal()
+	
+	// arConfig als .local doorgeven.   OPGELET: de andere variabelen niet opkuisen, want kunnen mogelijk nog via  [ProcebureBlock = 0]  opgevraagd worden   :-( 
 	Set arConfig("sDomain")=sDomain
 	Set arConfig("sDomCVT")=sDomCVT
 	Set arConfig("sDomVERW")=sDomVERW
@@ -1050,7 +1059,7 @@
 	; New Domain,UrlBase,WSOrdID,RefEnc, VERW
 	Set Domain=""
 	If SwitchDomain Do
-	. Set Domain=$$ltwTranslateDomain(KLNr)
+	. Set Domain=##class(APPS.TBXWeb.TBXContext).GeefWebDomeinVoorKlant(KLNr)
 	. Set:(Domain'="") KLNr=""
 	Set:(Domain="") Domain="www.tandem-box.com"
 	Set UrlBase="http://"_Domain_"/VHISIE/TBX/main.csp"
@@ -1062,19 +1071,6 @@
 	Set VERW="VHEPN"
 	Set RefEnc=$$CreateHashedRef^cspBasis.TBX.DecodeURL.tmpDev($LB(KLNr,VERW,WSOrdID,sMode))
 	Quit UrlBase_"?REF="_$$$EscapeURL(RefEnc)
-ltwTranslateDomain(KLNr)
-	; Temporary lookup method!
-	; Should be replaced by a lookup in Config-Global
-#define DomVHEPN     $$$TBoxWebDomeinVHEPN
-#define DomHEIN      $$$TBoxWebDomeinHEIN
-#define DomOPTIMA    $$$TBoxWebDomeinOPTIMA
-#define DomDUPONT    $$$TBoxWebDomeinDUPONT
-#define DomHELMY     $$$TBoxWebDomeinHELMY
-#define DomHFLE      $$$TBoxWebDomeinHFLE
-#define DomSFS       $$$TBoxWebDomeinSFS
-#define DomMBHO      $$$TBoxWebDomeinMBHO
-#define DomDEMO      $$$TBoxWebDomeinDEMO
-	Quit $CASE(KLNr,  "7833":$$$DomHEIN, "6279":$$$DomOPTIMA, "1736":$$$DomDUPONT, "4598":$$$DomHELMY, "2671":$$$DomHFLE, "12486":$$$DomSFS, $$$TBoxWebKlantNrMBHO:$$$DomMBHO, :"")   ; niet naar demo verwijzen ($$$DomDEMO)
 ]]></Implementation>
 </Method>
 
Index: csp/vhisie/TBX/BuildRef/tmpDev.mac.rou
===================================================================
diff -u -r2 -r22
--- csp/vhisie/TBX/BuildRef/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 2)
+++ csp/vhisie/TBX/BuildRef/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 22)
@@ -48,7 +48,7 @@
 	Do
 	. Set %blnBuildRef=1
     . Set DataOpt=$G(%request.Data("DATAOPT",1))
-    . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", 1:""))
+    . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", VERW="HFLB":"HFLB", 1:""))
 	. Kill %blnBuildRef
 	
 	If ($G(%request.Data("SUBMIT",1))="Encrypt") Do
@@ -59,7 +59,7 @@
 	. ;If $L($G(%request.Data("DATAOPT",1))) Do
 	. If $L(DataOpt) Do
 	..  Set DataOptCheck=DataOpt
-	..  Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", 1:""))
+	..  Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(VERW="SFS":"SFS", VERW="LMC":"LMC", VERW="MBHO":"MBHO", VERW="HFLB":"HFLB", 1:""))
 	..  ;Set EncDataOptOut=$system.Encryption.Base64Decode($TR(EncDataOptOut,"_-","+="))
 	. ;New Page,UrlTaal
 	. Set Page=$G(%request.Data("PAGE",1))
@@ -87,22 +87,30 @@
  
  
  
-	// Specific Test Page for testing DataOpt Parameter in URL (for OPTIMA / SFS / MBHO)
+	// Specific Test Page for testing DataOpt Parameter in URL (for OPTIMA / SFS / MBHO / HFLB)
 OnPreHTTPTestDataOpt(TestVERW)
 #define CSPPage          ##class(%CSP.Page)
-#define TaalDfl          $S(sDomVERW="HEIN":"D", sDomVERW="LMC":"F", sDomVERW="SFS":"D", 1:"N")
 	  s:('$D(ClientIP)) ClientIP="192.168.1.97"
 	  ;d WL^vhDBG($C(13,10))
 	New Ref,RefNew,RefArray,tmpRq,tmpAr,tmpTaal
 	Set %RemoteIP=$G(%request.CgiEnvs("REMOTE_ADDR"))
 	Do ophInitLookups^cspBasis.TBX.DecodeURL.tmpDev
+ 
+	New TBXContext,DefaultTaal
+	Set TBXContext=##class(APPS.TBXWeb.TBXContext).InitFromHttpRequest()
+	Set sDomain=TBXContext.GeefHttpRequestDomein()
+	Set sDomCVT=TBXContext.GeefWebDomein()
+	Set sDomVERW=TBXContext.GeefDomeinVerwerker()
+	Set sDomKLNr=TBXContext.GeefDomeinKlantNummer()
+	Set DefaultTaal=TBXContext.GeefDefaultTaal()
+ 
 	//   URL --> domain / sDomVERW / sDomKLNr
-	Set sDomain=$$GetURLDomain^cspBasis.Library
-	Set sDomCVT=$S(TestVERW="LMC":"www.optima-tbx.fr", TestVERW="SFS":"tbx.sfsunimarket.biz", TestVERW="MBHO":$$$TBoxWebDomeinMBHO, 1:$$TBXDomainCVT^cspBasis.Library(sDomain))
-	Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))
-	Set sDomVERW=$LG(lbDomLU,1)
-	Set sDomKLNr=$LG(lbDomLU,2)
-	Set Taal=$G(%request.Data("Taal",1),$$$TaalDfl)
+	;Set sDomain=$$GetURLDomain^cspBasis.Library
+	;Set sDomCVT=$S(TestVERW="LMC":"www.optima-tbx.fr", TestVERW="SFS":"tbx.sfsunimarket.biz", TestVERW="MBHO":$$$TBoxWebDomeinMBHO, TestVERW="HFLB":$$$TBoxWebDomeinHFLB, 1:$$TBXDomainCVT^cspBasis.Library(sDomain))
+	;Set lbDomLU=##class(WS.TBX.Order).DomainLookUp(sDomCVT,$LB("VERW","KLNR"))
+	;Set sDomVERW=$LG(lbDomLU,1)
+	;Set sDomKLNr=$LG(lbDomLU,2)
+	Set Taal=$G(%request.Data("Taal",1),DefaultTaal)
 	Set QS=$G(%request.CgiEnvs("QUERY_STRING"))
     Set Ref=$G(%request.Data("REF",1))
 	Set RefNew=$G(%request.Data("REF",1),$$$RefStartNew)   ; Als REF niet meegegeven is, StartNew (dfl) gebruiken
@@ -124,20 +132,23 @@
 	. Set wsID=$G(RefArray("WSID"))
 	. Set sMode=$G(RefArray("MODE"))
 	Set:($G(VERW)="") VERW=sDomVERW
+		d WLIP^vhDBG(97,"sDomVERW="_sDomVERW_"  VERW="_VERW_"   TestVERW="_TestVERW_"")
+ 
 	Set blnNoAccess=0
 	If 0  Set blnNoAccess=1
-	;Else  If sDomVERW="SFS"  Set blnNoAccess=(%RemoteIP'?1(1"192.168.1."1.3N,1"77.59.193.234",1"195.141.221.1"))
-	;Else  If sDomVERW="LMC"  Set blnNoAccess=(%RemoteIP'?1(1"192.168.1."1.3N,1"92.103.129.165",1"212.103.4.85"))  || 1    ; blocked for all IP 
-	Else  If sDomVERW="SFS"  Set blnNoAccess=$$$Not($$$AccessTestPageDataOptSFS(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N)))
-	Else  If sDomVERW="LMC"  Set blnNoAccess=$$$Not($$$AccessTestPageDataOptLMC(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N)))  || 1    ; blocked for all IP 
-	Else  If sDomVERW="MBHO" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptMBHO(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N)))
+	If (TestVERW'=sDomVERW) Set blnNoAccess=1
+	Else  If sDomVERW="SFS"  Set blnNoAccess=$$$Not($$$AccessTestPageDataOptSFS(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N,1"127.0.0.1")))
+	Else  If sDomVERW="LMC"  Set blnNoAccess=$$$Not($$$AccessTestPageDataOptLMC(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N,1"127.0.0.1")))  || 1    ; blocked for all IP 
+	Else  If sDomVERW="MBHO" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptMBHO(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N,1"127.0.0.1")))
+	Else  If sDomVERW="HFLB" Set blnNoAccess=$$$Not($$$AccessTestPageDataOptHFLB(%RemoteIP)||(%RemoteIP?1(1"192.168.1."1.3N,1"127.0.0.1")))
 	Else  Set blnNoAccess=1
 	
+		d WLIP^vhDBG(97,"blnNoAccess="_blnNoAccess_"")
 	Set RefOut=Ref
 	If 'blnNoAccess Do
 	. Set %blnBuildRef=1
     . Set DataOpt=$G(%request.Data("DATAOPT",1))
-    . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,.tmpAr,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO",1:"LMC"))
+    . Set DataOptOut=$$OPTIMADecryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,.tmpAr,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO", sDomVERW="HFLB":"HFLB", 1:"LMC"))
     . Kill %blnBuildRef
 	Set tmpTaal=$G(tmpAr("Taal"))
 	Set:(tmpTaal?1(1"N",1"F",1"E",1"D")) Taal=tmpTaal
@@ -148,6 +159,8 @@
 	. Set wsID=$G(%request.Data("WSID",1))
 	. Set sMode=$G(%request.Data("MODE",1))
  
+		d WLIP^vhDBG(97,"blnNoAccess="_blnNoAccess_"   DataOptOut="_$G(DataOptOut))
+ 
 	If (sDomVERW="SFS")&&(blnNoAccess) Do  Quit 1              ; Block access to this page.  Only enable it when requested
 	. ;Set blnNoAccess=1
 	. Set msg="TestPage voor SFS is geblokkeerd (/VHISIE/TBX/TestDataOptSFS.csp). "_$$$CRLF_"Toegang enkel mogelijk op aanvraag."_$$$CRLF
@@ -158,6 +171,11 @@
 	. Set msg="TestPage voor MBHO is geblokkeerd (/VHISIE/TBX/TestDataOptMBHO.csp). "_$$$CRLF_"Toegang enkel mogelijk op aanvraag."_$$$CRLF
 	. Do ophSendAlertMail^csp.vhisie.TBX.Main.tmpDev(msg)
 	. Do ophAddToLog("!TESTOPTMBHO!")
+	Else  If (sDomVERW="HFLB")&&(blnNoAccess) Do  Quit 1       ; Block access to this page.  Only enable it when requested
+	. ;Set blnNoAccess=1
+	. Set msg="TestPage voor HFLB is geblokkeerd (/VHISIE/TBX/TestDataOptHFLB.csp). "_$$$CRLF_"Toegang enkel mogelijk op aanvraag."_$$$CRLF
+	. Do ophSendAlertMail^csp.vhisie.TBX.Main.tmpDev(msg)
+	. Do ophAddToLog("!TESTOPTHFLB!")
 	Else  If blnNoAccess Do  Quit 1                            ; Block access to this page.  Only enable it when requested
 	. ;Set blnNoAccess=1
 	. Set msg="TestPage voor Optima is geblokkeerd (/VHISIE/TBX/TestDataOptLMC.csp). "_$$$CRLF_"Toegang enkel mogelijk op aanvraag."_$$$CRLF
@@ -172,19 +190,19 @@
 	. ;If $L($G(%request.Data("DATAOPT",1))) Do
 	. If $L(DataOpt) Do
 	..  Set DataOptCheck=DataOpt
-	..  Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO", 1:"LMC"))
+	..  Set EncDataOptOut=$$OPTIMAEncryptData^cspBasis.TBX.DecodeURL.tmpDev(DataOpt,$S(sDomVERW="SFS":"SFS", sDomVERW="MBHO":"MBHO", sDomVERW="HFLB":"HFLB", 1:"LMC"))
 	..  ;Set EncDataOptOut=$system.Encryption.Base64Decode($TR(EncDataOptOut,"_-","+="))
 	..  If blnKeySteps Do ophOPTIMAIntermediates(DataOpt,sDomVERW)
 	. ;New Page,UrlTaal
 	. Set Page=$G(%request.Data("PAGE",1))
 	. Set UrlTaal=$G(%request.Data("URLTAAL",1))
 	. Set UrlOut=$S($L(Page):Page_"?REF="_EncRefOut_$S($L(UrlTaal):"&Taal="_UrlTaal,1:""), 1:"")
-	Do ophAddToLog($S(sDomVERW="LMC":"TESTOPTIMA", sDomVERW="SFS":"TESTOPTSFS", sDomVERW="MBHO":"TESTOPTMBHO", 1:"TESTDATAOPT"))
+	Do ophAddToLog($S(sDomVERW="LMC":"TESTOPTIMA", sDomVERW="SFS":"TESTOPTSFS", sDomVERW="MBHO":"TESTOPTMBHO", sDomVERW="HFLB":"TESTOPTHFLB", 1:"TESTDATAOPT"))
 	Quit 1
 ophOPTIMAIntermediates(Data,sDomVERW)
 	New OptimaKey,encData,Step1,Step2,Step3,Step4,Step2Hex
 	Quit:($G(Data)="") ""
-	Set OptimaKey=$S(sDomVERW="LMC":$$$OptimaKey, sDomVERW="SFS":$$$SfsOptKey, sDomVERW="MBHO":$$$MBHollandOptKey, 1:ERROR)
+	Set OptimaKey=$S(sDomVERW="LMC":$$$OptimaKey, sDomVERW="SFS":$$$SfsOptKey, sDomVERW="MBHO":$$$MBHollandOptKey, sDomVERW="HFLB":$$$HafeleBEOptKey, 1:ERROR)
 	Set Step1=Data
 	Set Step2=$system.Encryption.AESEncode(Step1,OptimaKey)
 	Set Step3=$TR($system.Encryption.Base64Encode(Step2),$$$CRLF,"")
Index: cspBasis/GAProdDfls.cls.xml
===================================================================
diff -u -r2 -r22
--- cspBasis/GAProdDfls.cls.xml	(.../GAProdDfls.cls.xml)	(revision 2)
+++ cspBasis/GAProdDfls.cls.xml	(.../GAProdDfls.cls.xml)	(revision 22)
@@ -107,7 +107,7 @@
 <Method name="Init">
 <FormalSpec>KLNr:%String,sDomVERW:%String,DCM:%String,Taal:%String="",lbAllowVPK:%List=""</FormalSpec>
 <Implementation><![CDATA[
-	#define TaalDfl   $S(sDomVERW="HEIN":"D", sDomVERW="LMC":"F", sDomVERW="SFS":"D", 1:"N")
+	#define TaalDfl   ##class(APPS.TBXWeb.TBXContext).GeefDefaultTaalVoorVerwerker(sDomVERW)
 
 	Set ..KLNr=KLNr
 	Set ..sDomVERW=sDomVERW
@@ -125,7 +125,7 @@
 
 <UDLText name="T">
 <Content><![CDATA[
-/***   TEST METHOD (for development)    *** /
+/***   BUILD DATA FROM GLOBALS          *** /
 /***   ==============================   *** /
 /***                                    ***/
 ]]></Content>
@@ -233,7 +233,7 @@
 	Set:(arMtnDfl("ASM")'?1(1"",1"No")) sHtml=sHtml_$S($L(sHtml):$$$Separator,1:"")_$$$fmtLabel(cspBasis.WebTextValue("Antislipmat",Taal,"L"))_": "_$$$fmtValue(arMtnDfl("ASM"))_$$$CRLF
 	;Set:(arMtnDfl("BM")'?1(1"",1"No")) sHtml=sHtml_$S($L(sHtml):$$$Separator,1:"")_$$$fmtValue(arMtnDfl("BM"))_$$$CRLF
 	If blnVPK Do
-	. Set:(tmpVPK'?1(1"",1"No",1"S",1"Z",1"A",1"B")) arMtnDfl("VPK")=cspBasis.WebTextValue("VerpakBulk",Taal,"L",$LB("L"))_": "_arMtnDfl("VPK")
+	. Set:(tmpVPK'?1(1"",1"No",1"S",1"Z",1"A",1"B",1"X",1"Y")) arMtnDfl("VPK")=cspBasis.WebTextValue("VerpakBulk",Taal,"L",$LB("L"))_": "_arMtnDfl("VPK")   ; Added "X","Y" by WimV on 31/05/2011  - niet zeker of dit nodig is. 
 	. Set:(blnVPK)&&(arMtnDfl("VPK")'?1(1"",1"No")) sHtml=sHtml_$S($L(sHtml):"<BR>",1:"")_$$$fmtLabel(cspBasis.WebTextValue("Verpakking",Taal,"L"))_": "_$$$fmtValue(arMtnDfl("VPK"))_$$$CRLF
 	Do   ; Niet Meeleveren 
 	. Set sNietMee=""
@@ -501,6 +501,14 @@
 ]]></Implementation>
 </Method>
 
+<UDLText name="T">
+<Content><![CDATA[
+/***   SAVE DATA TO GLOBALS             *** /
+/***   ==============================   *** /
+/***                                    ***/
+]]></Content>
+</UDLText>
+
 <Method name="SetKlantDefaults">
 <Description>
 Set Klant Defaults 
@@ -559,6 +567,14 @@
 ]]></Implementation>
 </Method>
 
+<UDLText name="T">
+<Content><![CDATA[
+/***   TEST METHOD (for development)    *** /
+/***   ==============================   *** /
+/***                                    ***/
+]]></Content>
+</UDLText>
+
 <Method name="BuildDefaultsCSPtest">
 <Description>
 Test method 
Index: DOM/PM/enu/LadeVariant.cls.xml
===================================================================
diff -u
--- DOM/PM/enu/LadeVariant.cls.xml	(revision 0)
+++ DOM/PM/enu/LadeVariant.cls.xml	(revision 22)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.PM.enu.LadeVariant">
+<ClassType>datatype</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.PM.enu.Variant</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TBXPlus">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.PM.enu.LadeVariant</ReturnType>
+<Implementation><![CDATA[	Quit "TBX_Plus"
+]]></Implementation>
+</Method>
+
+<Method name="TBXAntaro">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.PM.enu.LadeVariant</ReturnType>
+<Implementation><![CDATA[	Quit "TBX_Antaro"
+]]></Implementation>
+</Method>
+
+<Method name="TBXIntivo">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.PM.enu.LadeVariant</ReturnType>
+<Implementation><![CDATA[	Quit "TBX_Intivo"
+]]></Implementation>
+</Method>
+
+<Method name="TBXBaliko">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.PM.enu.LadeVariant</ReturnType>
+<Implementation><![CDATA[	Quit "TBX_Baliko"
+]]></Implementation>
+</Method>
+
+<Method name="TBXMengvorm">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.PM.enu.LadeVariant</ReturnType>
+<Implementation><![CDATA[	Quit "TBX_Mengvorm"
+]]></Implementation>
+</Method>
+
+<Method name="TAOO">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.PM.enu.LadeVariant</ReturnType>
+<Implementation><![CDATA[	Quit "TAOO"
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: Prod/Kenmerk/VertaalTransAbstract.cls.xml
===================================================================
diff -u -r2 -r22
--- Prod/Kenmerk/VertaalTransAbstract.cls.xml	(.../VertaalTransAbstract.cls.xml)	(revision 2)
+++ Prod/Kenmerk/VertaalTransAbstract.cls.xml	(.../VertaalTransAbstract.cls.xml)	(revision 22)
@@ -4,6 +4,7 @@
 <Abstract>1</Abstract>
 <ClassType>persistent</ClassType>
 <Super>%Library.Persistent</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="RelatedVertalingsClass">
 <Default>Res.VertalingAbstract</Default>
@@ -160,12 +161,11 @@
 
 <Query name="FilterVTsViaKenmerk">
 <Type>%Library.SQLQuery</Type>
-<FormalSpec>(paKenmerk:%Library.String)</FormalSpec>
+<FormalSpec>paKenmerk:%String</FormalSpec>
 <SqlQuery>SELECT ID, SleutelSelectExec, SleutelSelectExecType, VertalingsTypes
 FROM Prod_Kenmerk.VertaalTransAbstract
 WHERE (Kenmerk = :paKenmerk)
-ORDER BY VertalingsTypes
-</SqlQuery>
+ORDER BY VertalingsTypes</SqlQuery>
 <Parameter name="CONTAINID" value="1"/>
 <Parameter name="ROWSPEC" value="ID,SleutelSelectExec,SleutelSelectExecType,VertalingsTypes:%Library.String"/>
 </Query>
Index: BL/PR/GA/TandemBox.cls.xml
===================================================================
diff -u -r2 -r22
--- BL/PR/GA/TandemBox.cls.xml	(.../TandemBox.cls.xml)	(revision 2)
+++ BL/PR/GA/TandemBox.cls.xml	(.../TandemBox.cls.xml)	(revision 22)
@@ -61,6 +61,8 @@
 <Implementation><![CDATA[
 	;New BTExtent,BTDep,DC
 	If ($D(DC))||($L(DS)) Do
+	. Set:(DS="IS") DC="S"             ; Fix voor Inox standaard (idem als Baliko hieronder) 
+	. Set:(DS?1(1"BA",1"BI")) DC="B"   ; Fix voor Baliko (zie ook hieronder) 
 	. Set:($G(DC)="")&&($L(DS)) DC=..DesignCodeFromDS(DS)
 	. Set ..DC=DC
 	Else  Do
@@ -183,6 +185,8 @@
  Set tmpAr("Staffel")=          $LB("Staffel")
  ;Set tmpAr("Antislipmat")=     $LB("ASM")   ;  !!! NEW Key = "TBMat" !!!   (zie hoger)
  Set tmpAr("SpoelbakBreedte")=  $LB("SPBR")
+ Set tmpAr("SpoelbakBreedte1")= $LB("SPBR1")
+ Set tmpAr("SpoelbakBreedte2")= $LB("SPBR2")
  Set tmpAr("SpoelbakZkLi")=     $LB("SPZLI")
  Set tmpAr("SpoelbakZkRe")=     $LB("SPZRE")
  Set tmpAr("SpoelbakZkMi")=     $LB("SPRUGMID")
@@ -492,8 +496,8 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Quit:(Verpakking?1(1"S",1"O",1"B")) "False"
-	Quit:(Verpakking?1(1"Z",1"C",1"A")) "True"
+	Quit:(Verpakking?1(1"S",1"O",1"B",1"X")) "False"
+	Quit:(Verpakking?1(1"Z",1"C",1"A",1"Y")) "True"
 	Quit "ASK"
 ]]></Implementation>
 </Method>
@@ -525,14 +529,14 @@
 	Set:(OneDS?1(1"*",1"WS")) arKlrDfl("WS")=$LB("WI","WI","WI","WI","FG","S")
 	Set:(OneDS?1(1"*",1"GS")) arKlrDfl("GS")=$LB("MG","LG","MG","MG","FG","S")
 	Set:(OneDS?1(1"*",1"AS")) arKlrDfl("AS")=$LB("AL","LG","AL","AL","FG","S")
-	Set:(OneDS?1(1"*",1"IS")) arKlrDfl("IS")=$LB("IN","DG","CR","IN","FG","S")
+	Set:(OneDS?1(1"*",1"IS")) arKlrDfl("IS")=$LB("IN","DG","CR","IN","FG","S")      ; "IS" is obsolete 
 	Set:(OneDS?1(1"*",1"WI")) arKlrDfl("WI")=$LB("SW","WI","SW","SW","DIA8","I")
 	Set:(OneDS?1(1"*",1"GI")) arKlrDfl("GI")=$LB("MG","LG","MG","MG","GRI8","I")
 	Set:(OneDS?1(1"*",1"ZI")) arKlrDfl("ZI")=$LB("BZ","BZ","BZ","BZ","BRO8","I")
 	Set:(OneDS?1(1"*",1"II")) arKlrDfl("II")=$LB("IN","DG","CR","IN","GRI8","I")
 	Set:(OneDS?1(1"*",1"AI")) arKlrDfl("AI")=$LB("AL","LG","AL","AL","DIA8","I")
-	Set:(OneDS?1(1"*",1"BA")) arKlrDfl("BA")=$LB("BE","BE","CR","IN","FG","B")
-	Set:(OneDS?1(1"*",1"BI")) arKlrDfl("BI")=$LB("BI","EI","CR","IN","FG","B")
+	Set:(OneDS?1(1"*",1"BA")) arKlrDfl("BA")=$LB("BE","BE","CR","IN","FG","B")     ;  "BA" is obsolete 
+	Set:(OneDS?1(1"*",1"BI")) arKlrDfl("BI")=$LB("BI","EI","CR","IN","FG","B")     ;  "BI" is obsolete 
 	Set:(OneDS?1(1"*",1"GF")) arKlrDfl("GF")=$LB("MG","LG","MG","MG","FG","F")
 	Set:(OneDS?1(1"*",1"AF")) arKlrDfl("AF")=$LB("AL","LG","AL","AL","FG","F")
 	Set:(OneDS?1(1"*",1"GMA")) arKlrDfl("GMA")=$LB("MG","LG","MG","MG","FG","MA")
@@ -692,15 +696,18 @@
 </Method>
 
 <Method name="KLASFromLC">
+<Description>
+Geeft de Klasse vertrekkende van de LadeCode  
+Bijvoorbeeld :  voor LC = "MY/Z"  geeft Klasse = "SY"  
+                voor LC = "DLS2"  geeft Klasse = "SP2" </Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>LadeCode:%String</FormalSpec>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set objLade=##class(Prod.GAMeta.BT.LadeCode).%OpenId(LadeCode)
 	Quit:('$IsObject(objLade)) ""
-	Set Klasse = objLade.TBKenm.GetAt("TBKlasse")
-	Quit Klasse
+	Quit objLade.TBKenm.GetAt("TBKlasse")
 ]]></Implementation>
 </Method>
 
@@ -713,7 +720,12 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If DC?1(1"S",1"F",1"MA") {
+	Set Klasse = ..KLASFromLC(LadeCode)
+	If Klasse="SY2" {   ; LadeCode?.E1"Y2"0.1"/Z"
+		// Sifonlade Type2  is steeds verlaagd tot M-hoogte.
+		Set SPBinHoogte="M"
+	} 
+	ElseIf DC?1(1"S",1"F",1"MA") {
 		If (       LadeCode = "MS2" )  Set SPBinHoogte="M"
 		Else  If ( LadeCode = "BS2" )  Set SPBinHoogte="B"
 		Else  If ( LadeCode = "DS2" )  Set SPBinHoogte="D"
@@ -738,17 +750,85 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Klasse = ..KLASFromLC(LadeCode)
+	Set:($G(Klasse)="") Klasse = ..KLASFromLC(LadeCode)
 	
 	Set Aantal = 0
-	If Klasse="SY"         Set Aantal=$S(SPZK?1.E1".x2":2, 1:1)   ; Set Aantal=$S(LadeCode?1.E.1"Y2":2, LadeCode?1"MY":2, 1:1)   ; LadeCode?1"MY" simuleert dubbele sifon 
-	Else  If Klasse="SP2"  Set Aantal = 1
+	If Klasse="SP2"        Set Aantal = 1
+	Else  If Klasse="SY"   Set Aantal=$S(SPZK?1.E1".x2":2, 1:1)   ; Set Aantal=$S(LadeCode?1.E.1"Y2":2, LadeCode?1"MY":2, 1:1)   ; LadeCode?1"MY" simuleert dubbele sifon 
+	Else  If Klasse="SY2"  Set Aantal=$S(SPZK?1(1"BB",1"SS",1"BS",1"SB",1"MM"):2, 1:1)
 	Else                   Set Aantal = 0
 	
 	Quit Aantal
 ]]></Implementation>
 </Method>
 
+<Method name="CalcProboxWikkelInfo">
+<Description>
+Geeft de wikkel-lengte voor een tandembox-lade in Probox verpakking </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>DesignCode:%String,IsBinnenlade:%Boolean,LadeHoogte:%String,LadeBreedte:%Float</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[
+	Set LadeVariant=..GeefLadeVariantFromDesignCode(DesignCode)
+	Set WikkelInfo=##class(APPS.PM.Maatwerk.TBX.Probox.Calculator).GeefWikkelInfo(LadeVariant,IsBinnenlade,LadeHoogte,LadeBreedte)
+	Quit $LB(WikkelInfo.GeefWikkelLengte(),WikkelInfo.GeefAantal())
+]]></Implementation>
+</Method>
+
+<Method name="CalcProboxWikkelDiepte">
+<Description>
+Geeft de wikkel-diepte voor een tandembox-lade in Probox verpakking </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>LadeDiepte:%Integer</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.PM.Maatwerk.TBX.Probox.Calculator).GeefWikkelDiepte(LadeDiepte)
+]]></Implementation>
+</Method>
+
+<Method name="CalcProboxVolumeAandeel">
+<Description>
+Geeft het volume-aandeel voor een tandembox-lade in Probox verpakking </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>DesignCode:%String,IsBinnenlade:%Boolean,LadeDiepte:%Integer,LadeHoogte:%String,LadeBreedte:%Float</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[
+	Set LadeVariant=..GeefLadeVariantFromDesignCode(DesignCode)
+	Set VolumeAandeel=##class(APPS.PM.Maatwerk.TBX.Probox.Calculator).GeefVolumeAandeel(LadeVariant,IsBinnenlade,LadeDiepte,LadeHoogte,LadeBreedte)
+	Quit VolumeAandeel
+]]></Implementation>
+</Method>
+
+<Method name="GeefLadeVariantFromDesignCode">
+<Description>
+Geeft de enumeratie van LadeVariant voor de DesignCode (S, I, B, F, MA).</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>DesignCode:%String</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>DOM.PM.enu.LadeVariant</ReturnType>
+<Implementation><![CDATA[
+	Set LadeVariant=""
+	If DesignCode?1(1"S",1"F") {
+		Set LadeVariant=##class(DOM.PM.enu.LadeVariant).TBXPlus()
+	}
+	ElseIf DesignCode="I" {
+		Set LadeVariant=##class(DOM.PM.enu.LadeVariant).TBXIntivo()
+	}
+	ElseIf DesignCode="A" {
+		Set LadeVariant=##class(DOM.PM.enu.LadeVariant).TBXAntaro()
+	}
+	ElseIf DesignCode="MA" {
+		Set LadeVariant=##class(DOM.PM.enu.LadeVariant).TBXMengvorm()
+	}
+	ElseIf DesignCode="B" {
+		;Set LadeVariant=##class(DOM.PM.enu.LadeVariant).TBXBaliko()   ; DEPRECATED !!! 
+	}
+	Quit LadeVariant
+]]></Implementation>
+</Method>
+
 <Method name="DesignCodeFromDS">
 <Description>
 Geeft de DesignCode (S, I, B, F, MA) voor de gegeven DS.</Description>
@@ -812,7 +892,7 @@
 	. Set:(dsID="") dsID=$P(dsIDs,";",1)
 	Else  Do
 	. For i=1:1:$L(dsIDs,";") Do  Quit:(dsID'="")
-	. . Set:($LG(..BTDep("TBDesign","TBDesignCode",$P(dsIDs,";",i)),1)=BeperkDesignCode) dsID=$P(dsIDs,";",i)
+	. . Set:($LG($G(..BTDep("TBDesign","TBDesignCode",$P(dsIDs,";",i))),1)=BeperkDesignCode) dsID=$P(dsIDs,";",i)
 	Quit dsID
 ]]></Implementation>
 </Method>
@@ -842,7 +922,12 @@
 	;Quit:(BoxSide="") ""
 
 	// LadeCode , Boxside, Design 
-	Set LC=$TR(LadeCode,"2I\/","")
+	Set KLAS=..KLASFromLC(LadeCode)
+	Set LC=$TR(LadeCode,"I\/","")
+	If (LC["2")&&(KLAS="SP2") { 
+		Set LC=$TR(LC,"2","")
+	}
+
 	Set BS=BoxSide
 	Set DC=..DesignCodeFromDS($G(Design))   ; Intivo = I-design 
 	
@@ -864,14 +949,12 @@
 	. Set DC=""
 
 	// Dubbele sifonlade 
+	Set SifonQty=""
 	If $L($G(SPZK)) Do
 	. Set SifonQty=..SpoelbakUitsparingen(LadeCode,SPZK)
-	. Quit:(SifonQty<2)
-	.   ;d WLIP^vhDBG(97,"dubbele sifonlade : SifonQty="_SifonQty)
-	.   ;s SifonQty=""   ; TEMPORARY work-around : de images voor dubbele sifonlade verwijzen tijdelijk naar die van (enkele) sifonlade   (Added by WimV on 31/03/2010)
-	. Set LC=$$$Replace(LC,"Y","Y"_SifonQty)
+	. ;Set:(KLAS="SY")&&(SifonQty>1) LC=$$$Replace(LC,"Y","Y2")   ; Vorige opbouw van de imagecode. Deze gaf problemen voor klasse=SY2, want ladecode is reeds een "2" vlak na de "Y" 
 	
-	Quit DC_LC_$S($L(BS):"_"_BS, 1:"")
+	Quit DC_LC_$S($L(BS):"_"_BS, 1:"")_$S(SifonQty>1:"_x2",1:"")
 ]]></Implementation>
 </Method>
 
@@ -891,14 +974,7 @@
 	Quit:(LadeCode="") ""
 	
 	// Default Boxside indien leeg 
-	If $G(BoxSide)="" Do
-	. Set LC=$TR(LadeCode,"2I\/","")
-	. If ..DesignCodeFromDS($G(Design))?1(1"I",1"MA") Do   ; intivo + mengvorm-A
-	. . Set BoxSide=$S(LC?1(1"DLS"):"CAP", LC?1(1"DL",1"DLZ",1"CL",1"CLZ",1"DLY",1"DLYZ",1"CLY",1"CLYZ"):"COV", LC?1(1"D"):"ER", 1:"ZR")
-	. If ..DesignCodeFromDS($G(Design))?1(1"A") Do         ; antaro 
-	. . Set BoxSide=$S(LC?1(1"CM",1"CMZ",1"CMY",1"CMYZ"):"ER", 1:"ZR")
-	. Else  Do
-	. . Set BoxSide=$S(LC?1(1"DS"):"BD", LC?1(1"D",1"DZ",1"DY",1"DYZ"):"DR", LC?1(1"B",1"BZ",1"BS",1"BY",1"BYZ",1"C",1"CZ"):"ER", 1:"ZR")
+	If $G(BoxSide)="" Set BoxSide=..GeefZijwandVerhogingDefault(LadeCode,Design)
 	
 	Set blImage=##class(BL.Prod.ImageLink).Instantiate()
 	Set ObjRef=blImage.TBXImageViaCode(LadeCode, BoxSide, Design, .BinnenGreep, .SPZK)   ; Deze roept  ##class(BL.PR.GA.TandemBox).ImageCodeFromLC(...)  op 
@@ -909,6 +985,31 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefZijwandVerhogingDefault">
+<Description><![CDATA[
+Bij iedere LadeCode hoort een default ZijwandVerhoging.
+Bijvoorbeeld: als de waarde (boxside) nog niet geselecteerd is in de GUI, moet er toch reeds een image kunnen getoond worden --> deze defaulting nodig ]]></Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>LadeCode:%String,Design:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set LC=$TR(LadeCode,"2I\/","")   ; Zowel voor spoelbak type 2 als voor sifonlade type 2 wordt het cijfer 2 weggefilterd 
+	Set DC=..DesignCodeFromDS(Design)
+	
+	Set BoxSide=""
+	If DC?1(1"I",1"MA") {   ; intivo + mengvorm-A
+		Set BoxSide=$S(LC?1(1"DLS"):"CAP", LC?1(1"DL",1"DLZ",1"CL",1"CLZ",1"DLY",1"DLYZ",1"CLY",1"CLYZ"):"COV", LC?1(1"D"):"ER", 1:"ZR")
+	}
+	ElseIf DC?1(1"A") {     ; antaro 
+		Set BoxSide=$S(LC?1(1"CM",1"CMZ",1"CMY",1"CMYZ"):"ER", 1:"ZR")
+	}
+	Else {
+		Set BoxSide=$S(LC?1(1"DS"):"BD", LC?1(1"D",1"DZ",1"DY",1"DYZ"):"DR", LC?1(1"B",1"BZ",1"BS",1"BY",1"BYZ",1"C",1"CZ"):"ER", 1:"ZR")
+	}
+	Quit BoxSide
+]]></Implementation>
+</Method>
+
 <Method name="CalcInfoDiverse">
 <Description>
 Geeft een $LB() terug.  [formaat: $LB(key,value,key2,value2, ...) ]
@@ -928,11 +1029,13 @@
 	;#defin isBulkVPK_old (WSLn.ItemVPK?1(1"P",1"C",1"O"))
 	
 	Quit:('$G(WSOrdLn))
-	New WSLn,actTaal,DC,SPZKpc1,BlumotionVTL,SPZijkantVTL,SPZijkantVTL2,tmpLB
+	New WSLn,actTaal,DC,SPZKpc1,BlumotionVTL,SPZijkantVTL,SPZijkantVTL2,tmpLB,Klasse
 	Set WSLn=WSOrdLn
 	Set actTaal=$G(Taal,"N")
 	Set DC=WSLn.ItemDC
 	Set SPZKpc1=$P(WSLn.ItemSPZK,";",1)
+	Set Klasse=..KLASFromLC(WSLn.ItemLT)   ; WSLn.ItemLT  bevat de LadeCode 
+
 	Do
 	. If WSLn.ItemBM?1(1"I",1"v")      Set BlumotionVTL=""
 	. Else  If WSLn.ItemBM="T"         Set BlumotionVTL=##class(cspBasis.GAProdTBox).WebTextValue("BM_T",actTaal,"L")_$S($$$TipOnSynchro:"+SYNCHRO",1:"")
@@ -941,6 +1044,7 @@
 	. 
 	. Set SPZijkantVTL2=""
 	. If SPZKpc1=""                    Set SPZijkantVTL=""
+	. Else  If Klasse="SY2"            Set SPZijkantVTL="(TODO-SY2) "_$$$FCase(##class(Prod.GAMeta.BT.TBSPZijkant).TaalAfhOmsClass("",SPZKpc1,actTaal,,,DC))
 	. Else  If SPZKpc1="M"             Set SPZijkantVTL=##class(cspBasis.GAProdTBox).WebTextValue("SPZijstukken",actTaal,"L")_" (mm) "_$$$Replace($P(WSLn.ItemSPZK,";",2,3),";","_")
 	. Else  If SPZKpc1?1(1"SI01") Do
 	. .                                Set SPZijkantVTL=##class(cspBasis.GAProdTBox).WebTextValue("SifonRugstukken",actTaal,"L")_" (mm) "_$$$Replace($P(WSLn.ItemSPZK,";",2,3),";","_")
@@ -1036,6 +1140,14 @@
 	Do:('$D(Product.LookUp("PLItem"))) Product.BuildLookUp($LB("ICode"))   ; "PLItem" is onderdeel van BuildLU("ICode")
 	For  Set BTVal=..BTValues.GetNext(.BT) Quit:(BT="")  Do:($L($G(..LookUp(BT,"DIC")))) Product.SetItemValByPL($$$PL,BTVal)
 	Do Product.BuildLookUp($LB("PL"))
+	
+	/*
+	  d WLIP^vhDBG(97," items   : "_..BTValues.GetAt("SpoelbakBreedte")_" "_..BTValues.GetAt("SpoelbakBreedte1")_" ")
+	  Set DItemSPBR1=$G(Product.LookUp("PLItem","SPBR1","IOref"))
+	  d WLIP^vhDBG(97," item LU : "_$$$ArrayTT("Lookup(""PL"")",Product,"LookUp")_"     "_$$$CRLF_" oref: "_DItemSPBR1_" ")
+	  d:$IsObject(DItemSPBR1) WLIP^vhDBG(97," DItemSPBR1 : "_DItemSPBR1.IsActief())
+	*/
+	
 	Quit
 ]]></Implementation>
 </Method>
@@ -1069,7 +1181,7 @@
  #define SPZkOpMaat(%v)   (%v?1(1"M",1"SI".E))
 
  // Aantal uitsparingen bij Sifonlade of spoelbaklade 
- If KLAS="SY" Do
+ If KLAS?1(1"SY",1"SY2") Do
  . Set BT="SYQTY"
  . Set BTVal=..SpoelbakUitsparingen(LC,SPZK)
  . Do bwvAddToDataItem(BT,BTVal)
@@ -1078,15 +1190,19 @@
  . // Else  Dubbele sifonlade 
  . 
  . ; Controle op de afmetingen 
- . Set SPBR=$G(Product.LookUp("PL","SPBR"))
+ . If KLAS="SY2" Do
+ . . Set SPBR1=$G(Product.LookUp("PL","SPBR1"))
+ . . Set SPBR2=$G(Product.LookUp("PL","SPBR2"))
+ . Else  Do
+ . . Set SPBR1=$G(Product.LookUp("PL","SPBR"))
+ . . Set SPBR2=SPBR1
+ .
  . Set SPZLI=$G(Product.LookUp("PL","SPZLI"))
  . Set SPZRE=$G(Product.LookUp("PL","SPZRE"))
  . Set SPZMI=$G(Product.LookUp("PL","SPRUGMID"))
- .  ;Set SPZMI=160
- . d WL^vhDBG("Dubbele sifon : "_SPZLI_"+"_SPBR_"+"_SPZMI_"+"_SPBR_"+"_SPZRE_"="_(SPZLI+SPBR+SPZMI+SPBR+SPZRE)_"  IB="_IB)
- . Set scSPBR=$S(SPZLI+SPBR+SPZMI+SPBR+SPZRE=IB:$$$OK, 1:$$$ERROR($$$GeneralError,"Afmetingen dubbele sifonlade incorrect"))
+ .   d WL^vhDBG("Dubbele sifon : "_SPZLI_"+"_SPBR1_"+"_SPZMI_"+"_SPBR2_"+"_SPZRE_"="_(SPZLI+SPBR1+SPZMI+SPBR2+SPZRE)_"  IB="_IB)
+ . Set scSPBR=$S(SPZLI+SPBR1+SPZMI+SPBR2+SPZRE=IB:$$$OK, 1:$$$ERROR($$$GeneralError,"Afmetingen dubbele sifonlade incorrect"))
  . If $$$ISERR(scSPBR) Set X=YYY   ; Calculation must trigger an ERROR
- . 
 
  // Spoelbak brede/smalle zijstukken 
  If $L(SPZK)&&('$$$SPZkOpMaat(SPZK)) Do
@@ -1109,7 +1225,7 @@
  . Do Product.BuildLookUp($LB("PL"))
  
  // SifonLade of Spoelbak zijstukkken op maat, spoelbakBreedte berekenen indien nog niet gekend 
- If $L(SPZK)&&($G(SifonQty)<2) Do
+ If (KLAS'="SY2")&&($L(SPZK))&&($G(SifonQty)<2) Do
  . Set SPZLI=$G(Product.LookUp("PL","SPZLI"))
  . Set SPBR=$G(Product.LookUp("PL","SPBR"))
  . Set SPZRE=$G(Product.LookUp("PL","SPZRE"))
@@ -1126,6 +1242,15 @@
  . Do bwvAddToDataItem("SPZLI",SPZLI)
  . Do bwvAddToDataItem("SPBR",SPBR)
  . Do bwvAddToDataItem("SPZRE",SPZRE)
+ Else  If (KLAS="SY2")&&($L(SPZK))&&($G(SifonQty)<2) Do
+ . // Nieuwe SifonLade (type 2),  spoelbakBreedte controleren op correcte afmetingen 
+ . Set SPZLI=$G(Product.LookUp("PL","SPZLI"))
+ . Set SPBR=$G(Product.LookUp("PL","SPBR1"))
+ . Set SPZRE=$G(Product.LookUp("PL","SPZRE"))
+ . Set AftrekLP=0
+ . Set scSPBR=..CalcSPBreedtesOpMaat(IB,.SPZLI,.SPBR,.SPZRE,AftrekLP)
+ . If $$$ISERR(scSPBR) Do WL^vhDBG("Sifonlade type 2 : uitsparingBreedte fout in berekening : "_$$ParseStatus^vhLib(scSPBR))
+ . If $$$ISERR(scSPBR) Set X=YYY   ; Calculation must trigger an ERROR
  
  // Sifonlade D-hoogte heeft steeds B-rug (geldt ook voor C-hoogte)
  If (KLAS="SY")&&(RH?1(1"D",1"C",1"G")) Do   ; If LC?1(1"DY",1"DY/Z",1"DLY",1"DLY/Z",1"CLY",1"CLY/Z",1"CMY",1"CMY/Z") Do
@@ -1134,7 +1259,7 @@
  . Set BTVal="B"
  . Do bwvAddToDataItem(BT,BTVal)
 
- If KLAS="SP2" Do
+ If KLAS?1(1"SP2",1"SY2") Do
  . Set RSTL=$G(Product.LookUp("PL","RSTL"))
  . Set BinnenZijwandVolgtRSTL=0   ; conditioneel, afhankelijk van de UI (bvb Antaro BS2) 
  . If ($L(RSTL))&&(BinnenZijwandVolgtRSTL) Do
@@ -1171,7 +1296,7 @@
  
  Set BT="PRO"        ; IsPRO
  Set VPK=$G(Product.LookUp("PL","VERPAK"))   ; $$$PLp("Verpakking")
- Set BTVal=$S(VPK?1(1"P",1"I",1"A",1"C",1"O",1"B"):1, 1:0)
+ Set BTVal=$S(VPK?1(1"P",1"I",1"A",1"C",1"O",1"B",1"X",1"Y"):1, 1:0)
  Do bwvAddToDataItem(BT,BTVal)
  
  Do Product.BuildLookUp($LB("PL"))