Index: _vhisie/TBX/WizKleur.csp
===================================================================
diff -u -r1133 -r1204
--- _vhisie/TBX/WizKleur.csp	(.../WizKleur.csp)	(revision 1133)
+++ _vhisie/TBX/WizKleur.csp	(.../WizKleur.csp)	(revision 1204)
@@ -5,20 +5,20 @@
 	Set vtlMeerInfo=..WebTextValue("MeerInfo",Taal,"L",$LB("L"))
 
 	Set arVTL("KLR","DS_WS")=..WebTextValue("DS_WS",Taal,"L")       ;              wit - S(Plus) 
-	Set arVTL("KLR","DS_GS")=..WebTextValue("DS_GS",Taal,"L")       ;   grijs metallic - S
-  ;	Set arVTL("KLR","DS_AS")=..WebTextValue("DS_AS",Taal,"L")       ;        aluminium - S
-	Set arVTL("KLR","DS_IS")=..WebTextValue("DS_IS",Taal,"L")       ;             inox - S 
+	Set arVTL("KLR","DS_GS")=..WebTextValue("DS_GS",Taal,"L")       ;   grijs metallic - S 
+ ;	Set arVTL("KLR","DS_AS")=..WebTextValue("DS_AS",Taal,"L")       ;        aluminium - S 
+ ;	Set arVTL("KLR","DS_IS")=..WebTextValue("DS_IS",Taal,"L")       ;             inox - S 
 	Set arVTL("KLR","DS_WI")=..WebTextValue("DS_WI",Taal,"L")       ;         zijdewit - I(intivo) 
 	Set arVTL("KLR","DS_GI")=..WebTextValue("DS_GI",Taal,"L")       ;            grijs - I 
 	Set arVTL("KLR","DS_AI")=..WebTextValue("DS_AI",Taal,"L")       ;        aluminium - I 
 	Set arVTL("KLR","DS_II")=..WebTextValue("DS_II",Taal,"L")       ;             inox - I 
 	Set arVTL("KLR","DS_ZI")=..WebTextValue("DS_ZI",Taal,"L")       ;       zwartbruin - I 
-	Set arVTL("KLR","DS_BA")=..WebTextValue("DS_BA",Taal,"L")       ;     massief beuk - B 
-	Set arVTL("KLR","DS_BI")=..WebTextValue("DS_BI",Taal,"L")       ;      massief eik - B 
+ ;	Set arVTL("KLR","DS_BA")=..WebTextValue("DS_BA",Taal,"L")       ;     massief beuk - B 
+ ;	Set arVTL("KLR","DS_BI")=..WebTextValue("DS_BI",Taal,"L")       ;      massief eik - B 
 	Set arVTL("KLR","DS_GF")=..WebTextValue("DS_GF",Taal,"L")       ;   grijs metallic - F 
 	Set arVTL("KLR","DS_AF")=..WebTextValue("DS_AF",Taal,"L")       ;        aluminium - F 
 	Set arVTL("KLR","DS_GMA")=..WebTextValue("DS_GMA",Taal,"L")     ;   grijs mengvorm - MA 
-	Set arVTL("KLR","DS_IMA")=..WebTextValue("DS_IMA",Taal,"L")     ;    inox mengvorm - MA 
+ ;	Set arVTL("KLR","DS_IMA")=..WebTextValue("DS_IMA",Taal,"L")     ;    inox mengvorm - MA 
 	Set arVTL("KLR","DS_WA")=..WebTextValue("DS_WA",Taal,"L")       ;         zijdewit - A(antaro) 
 	Set arVTL("KLR","DS_GA")=..WebTextValue("DS_GA",Taal,"L")       ;            grijs - A
 	Set arVTL("KLR","DS_ZA")=..WebTextValue("DS_ZA",Taal,"L")       ;       zwartbruin - A
@@ -28,16 +28,16 @@
 	Set arVTL("KLR","KL_MG")=..WebTextValue("KL_MG",Taal,"L")       ;   grijs metallic 
 	Set arVTL("KLR","KL_AL")=..WebTextValue("KL_AL",Taal,"L")       ;        aluminium 
 	Set arVTL("KLR","KL_IN")=..WebTextValue("KL_IN",Taal,"L")       ;             inox 
-	Set arVTL("KLR","KL_BE")=..WebTextValue("KL_BE",Taal,"L")       ;   massief beuken 
-	Set arVTL("KLR","KL_BI")=..WebTextValue("KL_BI",Taal,"L")       ;    massief eiken 
+ ; 	Set arVTL("KLR","KL_BE")=..WebTextValue("KL_BE",Taal,"L")       ;   massief beuken 
+ ;	Set arVTL("KLR","KL_BI")=..WebTextValue("KL_BI",Taal,"L")       ;    massief eiken 
 	Set arVTL("KLR","KL_SW")=..WebTextValue("KL_SW",Taal,"L")       ;         zijdewit 
 	Set arVTL("KLR","KL_BZ")=..WebTextValue("KL_BZ",Taal,"L")       ;       terrazwart 
  /*   */
 	Set arVTL("KLR","KB_WI")=..WebTextValue("KL_WI_KB",Taal,"L")    ;              wit 
 	Set arVTL("KLR","KB_LG")=..WebTextValue("KL_LG",Taal,"L")       ;       lichtgrijs 
 	Set arVTL("KLR","KB_DG")=..WebTextValue("KL_DG",Taal,"L")       ;     donker grijs 
-	Set arVTL("KLR","KB_BE")=..WebTextValue("KL_BE_KB",Taal,"L")    ;           beuken 
-	Set arVTL("KLR","KB_EI")=..WebTextValue("KL_EI_KB",Taal,"L")    ;            eiken 
+ ;	Set arVTL("KLR","KB_BE")=..WebTextValue("KL_BE_KB",Taal,"L")    ;           beuken 
+ ;	Set arVTL("KLR","KB_EI")=..WebTextValue("KL_EI_KB",Taal,"L")    ;            eiken 
 	Set arVTL("KLR","KB_BZ")=..WebTextValue("KL_BZ_KB",Taal,"L")    ;       bruinzwart 
 	Set arVTL("KLR","KB_ZW")=..WebTextValue("KL_ZW",Taal,"L")       ;            zwart 
 	
@@ -113,7 +113,7 @@
 	. Set arVTL("KLR_RK_TOOLTIP")=..WebTextValue("Relingen",Taal,"L")_" + "_..WebTextValue("KleurBinFront",Taal,"L")
 	
 	Set DCSpanShow=0
-	For dcID="S","I","B","F","MA","A" Do
+	For dcID="S","B","I","F","MA","A" Do
 	. Set arDCShow(dcID)=''$LF(lbDesignChoices,dcID)  ; lbDesignChoices wordt gecreeerd in csp.vhisie.TBX.Wizard.tmpDev.MAC
 	. Set DCSpanShow=DCSpanShow+arDCShow(dcID)   ; Add boolean (0/1)
 	Set DCSpanShowHExtra=$S(DCSpanShow>1:0, 1:1)
@@ -213,7 +213,9 @@
 				<CSP:IF condition='arDCShow("MA")'>
 			<TD class="clsKleurItems BorderAll">
 				<DIV id="divDS_GMA" class="clsLadeKlr" onclick="ClickButtonObj(this,'DS');" onmouseover="ToggleButtonObj(this,'ON','DS');" onmouseout="ToggleButtonObj(this,'OFF','DS');">#(arVTL("KLR","DS_GMA"))#</DIV>
+<CSP:COMMENT><!--
 				<DIV id="divDS_IMA" class="clsLadeKlr" onclick="ClickButtonObj(this,'DS');" onmouseover="ToggleButtonObj(this,'ON','DS');" onmouseout="ToggleButtonObj(this,'OFF','DS');">#(arVTL("KLR","DS_IMA"))#</DIV>
+--></CSP:COMMENT>
 			</TD>
 				</CSP:IF>
 			<CSP:IF condition='(DCSpanHide>0)'>
Index: cspBasis/GAProdTBox.cls.xml
===================================================================
diff -u -r1074 -r1204
--- cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 1074)
+++ cspBasis/GAProdTBox.cls.xml	(.../GAProdTBox.cls.xml)	(revision 1204)
@@ -379,15 +379,14 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[
-	#define DCsDefaultXALL   $LB("S","I","B","F","MA")
-	#define DCsDefaultS      $LB("S","B")
+	#define DCsDefaultXALL   $LB("S","I","F","MA")
+	#define DCsDefaultS      $LB("S")
 	#define DCsDefaultI      $LB("I")
 	#define DCsDefaultA      $LB("A")
- ;	#define DCsDefaultX      $LB("S","B","F","MA")
-	#define DCsDefaultX      $LB("S","B","I","MA")
-	#define DCsDefaultXI     $LB("S","B","I","MA")
- ;	#define DCsDefault       "S:S\B~I:I~X:S\I\B\F\MA"
-	#define DCsDefault       "S:S\B~I:I~X:S\B\I\MA"
+ ;	#define DCsDefaultX      $LB("S","F","MA")
+	#define DCsDefaultX      $LB("S","I","MA")
+	#define DCsDefaultXI     $LB("S","I","MA")
+	#define DCsDefault       "S:S~I:I~A:A~X:S\I\MA"
 	#define Delim1           "~"
 	
 	//Set:(DCM'?1(1"S",1"I",1"X")) DCM="S"
@@ -410,7 +409,7 @@
 	Quit $CASE(DCM, "S":$$$DCsDefaultS, "I":$$$DCsDefaultI, "A":$$$DCsDefaultA, "X":$$$DCsDefaultX,  :ERROR)   ; ERROR will not occur 
 	
 gdcGetDCsList(sDomVERW,KLNr)
-	Set KlantDCs=$G($$$GlobalKLData(0,sDomVERW,KLNr,"DESIGNCHOICES"))   ; contains e.g. "S:S\B~I:I~X:S\I\B\F\MA" 
+	Set KlantDCs=$G($$$GlobalKLData(0,sDomVERW,KLNr,"DESIGNCHOICES"))   ; contains e.g. "S:S\F~I:I~X:S\I\F\MA" 
 	Set lbDCs=""
 	For i=1:1:$L(KlantDCs,$$$Delim1) Set:($P($P(KlantDCs,$$$Delim1,i),":",1)=DCM) lbDCs=$$PiecesToList^vhLib($P($P(KlantDCs,$$$Delim1,i),":",2),"\")  Quit:($L(lbDCs))
 	Quit lbDCs
Index: BL/PR/GA/TandemBox.cls.xml
===================================================================
diff -u -r1133 -r1204
--- BL/PR/GA/TandemBox.cls.xml	(.../TandemBox.cls.xml)	(revision 1133)
+++ BL/PR/GA/TandemBox.cls.xml	(.../TandemBox.cls.xml)	(revision 1204)
@@ -66,6 +66,8 @@
 	Else  Do
 	. Set DC=..DC
 
+	Set:(..DC="B") ..DC="S"   ; Fix voor Baliko, anders crasht het systeem (TBoxWeb) op reeds eerder ingegeven lades  (Added by WimV on 19/05/2011)
+
 	// Throw error if DC=""
 	Set:(..DC="") $ECODE="U blTBox Init : DC cannot be empty."
 	Quit:(..DC="")