Index: development/models/mat/MAT Configurator,1.0.0.xml
===================================================================
diff -u -r2496 -r2497
--- development/models/mat/MAT Configurator,1.0.0.xml	(.../MAT Configurator,1.0.0.xml)	(revision 2496)
+++ development/models/mat/MAT Configurator,1.0.0.xml	(.../MAT Configurator,1.0.0.xml)	(revision 2497)
@@ -368,7 +368,7 @@
                 </PROPERTY>
                 <PROPERTY ID="ViaNettoDiepte" LABEL="ViaNettoDiepte" TYPE="Boolean" VALUE="false" ENABLED="false" ANALYZE="true" SEQNO="31" USED="1:57,58,62,63,96,98,99,105,106,143">
                 </PROPERTY>
-                <PROPERTY ID="Variant" LABEL="Variant" TYPE="String" VALUE="MAT_Standaard" MANDATORY="true" ENABLED="false" SEQNO="32" USED="1:20,31,124,128,141,142,150,151">
+                <PROPERTY ID="Variant" LABEL="Variant" TYPE="String" VALUE="MAT_Standaard" MANDATORY="true" ENABLED="false" ANALYZE="true" SEQNO="32" USED="1:20,31,124,128,141,142,150,151">
                 </PROPERTY>
               </PROPERTIES>
             </CLASS>
@@ -1297,7 +1297,7 @@
 for i = 1 to len(CONFIG.Database.ConfigAnalyseProperties@options)
 	CONFIG.Database.ConfigAnalyseProperties = CONFIG.Database.ConfigAnalyseProperties@option(i)@id;
 
-	if ((CONFIG.Database.ConfigAnalyseProperties.PropertyName + "Default") in CONFIG.Defaults.ReferentieConfiguratie@options) then
+	if ((CONFIG.Database.ConfigAnalyseProperties.PropertyName) in CONFIG.Defaults.ReferentieConfiguratie@options) then
 		_Result = SetValue((CONFIG.Database.ConfigAnalyseProperties.PropertyName + "Default"); CONFIG.Database.ConfigAnalyseProperties.Value);
 	end if;
 end for;
@@ -1335,7 +1335,7 @@
 for i = 1 to len(CONFIG.Database.ConfigAnalyseProperties@options)
 	CONFIG.Database.ConfigAnalyseProperties = CONFIG.Database.ConfigAnalyseProperties@option(i)@id;
 
-	if ((CONFIG.Database.ConfigAnalyseProperties.PropertyName + "Default") in CONFIG.Defaults.KlantVoorkeuren@options) then
+	if ((CONFIG.Database.ConfigAnalyseProperties.PropertyName) in CONFIG.Defaults.KlantVoorkeuren@options) then
 		_Result = SetValue((CONFIG.Database.ConfigAnalyseProperties.PropertyName + "Default"); CONFIG.Database.ConfigAnalyseProperties.Value);
 	end if;
 end for;
@@ -1749,29 +1749,29 @@
 if (BEHAVIOR.InvullenDATAKenmerkenViaGetArgs) then
 	DATA.Kenmerken.LadeType = GetArg("data;kenmerken;ladetype");
 else
-	if (STATE.BijhorendeLadeConfiguratieLoaded) then
-		CONFIG.Database.ConfigAnalyseProperties = CONFIG.Database.ConfigAnalyseProperties@option("Data.Kenmerken.Zijwandtype")@id;
-		local string _ZijwandType = CONFIG.Database.ConfigAnalyseProperties.Value;
-		
+	if (STATE.BijhorendeLadeConfiguratieLoaded) then		
 		CONFIG.Database.ConfigAnalyseProperties = CONFIG.Database.ConfigAnalyseProperties@option("Data.Kenmerken.Variant")@id;
 		local string _LadeVariant = CONFIG.Database.ConfigAnalyseProperties.Value;
 		
 		if (_LadeVariant == "LBX") then
-				if (_ZijwandType == "Free") then
-					DATA.Kenmerken.LadeType = "LegraboxFree";
-				else 
-					DATA.Kenmerken.LadeType = "LegraboxPure";
-				end if;
+			CONFIG.Database.ConfigAnalyseProperties = CONFIG.Database.ConfigAnalyseProperties@option("Data.Kenmerken.Zijwandtype")@id;
+			local string _ZijwandType = CONFIG.Database.ConfigAnalyseProperties.Value;
+			
+			if (_ZijwandType == "Free") then
+				DATA.Kenmerken.LadeType = "LegraboxFree";
+			else 
+				DATA.Kenmerken.LadeType = "LegraboxPure";
 			end if;
-			if (_LadeVariant == "MVX") then
-				DATA.Kenmerken.LadeType = "Merivobox";
-			end if;
-			if (_LadeVariant == "TAX") then
-				DATA.Kenmerken.LadeType = "Taorbox";
-			end if;
-			if (_LadeVariant == "TBX") then
-				DATA.Kenmerken.LadeType = "Tandembox";
-			end if;			
+		end if;
+		if (_LadeVariant == "MVX") then
+			DATA.Kenmerken.LadeType = "Merivobox";
+		end if;
+		if (_LadeVariant == "TAX") then
+			DATA.Kenmerken.LadeType = "Taorbox";
+		end if;
+		if (_LadeVariant == "TBX") then
+			DATA.Kenmerken.LadeType = "Tandembox";
+		end if;			
 	end if;
 	
 	if (not(BEHAVIOR.OperationMode == "AxCreate") and not(STATE.BijhorendeLadeConfiguratieLoaded)) then
@@ -1799,6 +1799,9 @@
 for i = 1 to len(DATA.Kenmerken.LadeToepassing@options)
 	UI.Kenmerken.LadeToepassing@option(i)@valid = DATA.Kenmerken.LadeToepassing@option(i)@valid;
 end for;
+
+UI.Kenmerken.LadeToepassing@option("SP")@valid = false;
+UI.Kenmerken.LadeToepassing@option("SY")@valid = false;
 </IMPLICATION>
         <DESCRIPTION>Valids</DESCRIPTION>
         <LHS>;ui.kenmerken.ladetoepassing@valids;</LHS>
@@ -1807,8 +1810,8 @@
         <CONDITION>true</CONDITION>
         <IMPLICATION>
 UI.Kenmerken.LadeToepassing@visible = not(DATA.Kenmerken.ViaNettoBreedte and DATA.Kenmerken.ViaNettoDiepte);
-UI.Kenmerken.LadeToepassing@option("SP")@visible = false;
-UI.Kenmerken.LadeToepassing@option("SY")@visible = false;
+UI.Kenmerken.LadeToepassing@option("SP")@visible = true;
+UI.Kenmerken.LadeToepassing@option("SY")@visible = true;
 </IMPLICATION>
         <DESCRIPTION>Visible</DESCRIPTION>
         <LHS>;ui.kenmerken.ladetoepassing@visible;ui.kenmerken.ladetoepassing@options;</LHS>
@@ -2094,6 +2097,7 @@
 	
 	if (STATE.GebruikDefaultWaarden) then
 		DATA.Kenmerken.HeeftOpvullijstRechts = DATA.Kenmerken.HeeftOpvullijstRechtsDefault;
+
 	end if;
 	
 	if (not(BEHAVIOR.OperationMode == "AxCreate") and not(STATE.BijhorendeLadeConfiguratieLoaded) and not(STATE.GebruikDefaultWaarden)) then