diff --git a/base/src/org/compiere/model/I_AD_SysConfig.java b/base/src/org/compiere/model/I_AD_SysConfig.java
index bb1f863817..bcb47cb483 100644
--- a/base/src/org/compiere/model/I_AD_SysConfig.java
+++ b/base/src/org/compiere/model/I_AD_SysConfig.java
@@ -37,7 +37,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_SysConfig
  *  @author Trifon Trifonov (generated) 
- *  @version Release 3.3.1b
+ *  @version Release 3.3.1t
  */
 public interface I_AD_SysConfig 
 {
@@ -65,6 +65,19 @@ public interface I_AD_SysConfig
 	/** Get System Configurator	  */
 	public int getAD_SysConfig_ID();
 
+    /** Column name ConfigurationLevel */
+    public static final String COLUMNNAME_ConfigurationLevel = "ConfigurationLevel";
+
+	/** Set Configuration Level.
+	  * Configuration Level for this parameter
+	  */
+	public void setConfigurationLevel (String ConfigurationLevel);
+
+	/** Get Configuration Level.
+	  * Configuration Level for this parameter
+	  */
+	public String getConfigurationLevel();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
@@ -78,6 +91,21 @@ public interface I_AD_SysConfig
 	  */
 	public String getDescription();
 
+    /** Column name EntityType */
+    public static final String COLUMNNAME_EntityType = "EntityType";
+
+	/** Set Entity Type.
+	  * Dictionary Entity Type;
+ Determines ownership and synchronization
+	  */
+	public void setEntityType (String EntityType);
+
+	/** Get Entity Type.
+	  * Dictionary Entity Type;
+ Determines ownership and synchronization
+	  */
+	public String getEntityType();
+
     /** Column name Name */
     public static final String COLUMNNAME_Name = "Name";
 
diff --git a/base/src/org/compiere/model/MSysConfig.java b/base/src/org/compiere/model/MSysConfig.java
index 3fd7e7fe7a..d1fcc6fc1d 100644
--- a/base/src/org/compiere/model/MSysConfig.java
+++ b/base/src/org/compiere/model/MSysConfig.java
@@ -24,6 +24,7 @@ import org.compiere.util.*;
  *	
  *  @author Armen Rizal
  *  @version $Id: MSysConfig.java,v 1.5 2005/11/28 11:56:45 armen Exp $
+ *  Contributor: Carlos Ruiz - globalqss - [ 1800371 ] System Configurator Enhancements
  */
 public class MSysConfig extends X_AD_SysConfig
 {
@@ -64,7 +65,7 @@ public class MSysConfig extends X_AD_SysConfig
 	public static String getValue(String Name, String defaultValue)
 	{
 		String str = null;
-		String sql = "SELECT Value FROM AD_SysConfig WHERE Name=? and IsActive='Y'";
+		String sql = "SELECT Value FROM AD_SysConfig WHERE Name=? AND AD_Client_ID = 0 AND AD_Org_ID = 0 AND IsActive='Y'";
 		try
 		{
 			PreparedStatement pstmt = DB.prepareStatement(sql, null);
@@ -163,5 +164,328 @@ public class MSysConfig extends X_AD_SysConfig
 			return Boolean.valueOf(s).booleanValue();
 	}
 	
+	/**
+	 * Get client configuration property of type string
+	 * @param Name
+	 * @param defaultValue
+	 * @param Client ID
+	 * @return String
+	 */
+	public static String getValue(String Name, String defaultValue, int AD_Client_ID)
+	{
+		String str = null;
+		String sql = "SELECT Value FROM AD_SysConfig WHERE Name=? AND AD_Client_ID = ? AND AD_Org_ID = 0 AND IsActive='Y'";
+		try
+		{
+			PreparedStatement pstmt = DB.prepareStatement(sql, null);
+			pstmt.setString(1, Name);
+			pstmt.setInt(2, AD_Client_ID);
+			ResultSet rs = pstmt.executeQuery();
+			if (rs.next())
+				str = rs.getString(1);
+			rs.close();
+			pstmt.close();
+		}
+		catch (SQLException e)
+		{
+			s_log.log(Level.SEVERE, "getValue", e);
+		} 
+		if (str == null) {
+			// if not found by client - get the system parameter
+			return getValue(Name, defaultValue);
+		}
+		return (str.trim());
+	}
+	
+	/**
+	 * Get system configuration property of type string
+	 * @param Name
+	 * @param Client ID
+	 * @return String
+	 */
+	public static String getValue(String Name, int AD_Client_ID)
+	{
+		return (getValue(Name, null, AD_Client_ID));
+	}
+	
+	/**
+	 * Get system configuration property of type int
+	 * @param Name
+	 * @param defaultValue
+	 * @param Client ID
+	 * @return int
+	 */
+	public static int getIntValue(String Name, int defaultValue, int AD_Client_ID)
+	{
+		String s = getValue(Name, AD_Client_ID);
+		if (s == null)
+			return defaultValue; 
+		
+		if (s.length() == 0)
+			return defaultValue;
+		//
+		try
+		{
+			return Integer.parseInt(s);
+		}
+		catch (NumberFormatException e)
+		{
+			s_log.log(Level.SEVERE, "getIntValue (" + Name + ") = " + s, e);
+		}
+		return defaultValue;
+	}
+	
+	/**
+	 * Get system configuration property of type double
+	 * @param Name
+	 * @param defaultValue
+	 * @param Client ID
+	 * @return double
+	 */
+	public static double getDoubleValue(String Name, double defaultValue, int AD_Client_ID)
+	{
+		String s = getValue(Name, AD_Client_ID);
+		if (s == null || s.length() == 0)
+			return defaultValue;
+		//
+		try
+		{
+			return Double.parseDouble(s);
+		}
+		catch (NumberFormatException e)
+		{
+			s_log.log(Level.SEVERE, "getDoubleValue (" + Name + ") = " + s, e);
+		}
+		return defaultValue;
+	}
+	
+	/**
+	 * Get system configuration property of type boolean
+	 * @param Name
+	 * @param defaultValue
+	 * @param Client ID
+	 * @return boolean
+	 */
+	public static boolean getBooleanValue(String Name, boolean defaultValue, int AD_Client_ID)
+	{
+		String s = getValue(Name, AD_Client_ID);
+		if (s == null || s.length() == 0)
+			return defaultValue;
+		
+		if ("Y".equalsIgnoreCase(s))
+			return true;
+		else if ("N".equalsIgnoreCase(s))
+			return false;
+		else
+			return Boolean.valueOf(s).booleanValue();
+	}
 
-}	//	MSysConfig
+	/**
+	 * Get client configuration property of type string
+	 * @param Name
+	 * @param defaultValue
+	 * @param Client ID
+	 * @param Organization ID
+	 * @return String
+	 */
+	public static String getValue(String Name, String defaultValue, int AD_Client_ID, int AD_Org_ID)
+	{
+		String str = null;
+		String sql = "SELECT Value FROM AD_SysConfig WHERE Name=? AND AD_Client_ID = ? AND AD_Org_ID = ? AND IsActive='Y'";
+		try
+		{
+			PreparedStatement pstmt = DB.prepareStatement(sql, null);
+			pstmt.setString(1, Name);
+			pstmt.setInt(2, AD_Client_ID);
+			pstmt.setInt(3, AD_Org_ID);
+			ResultSet rs = pstmt.executeQuery();
+			if (rs.next())
+				str = rs.getString(1);
+			rs.close();
+			pstmt.close();
+		}
+		catch (SQLException e)
+		{
+			s_log.log(Level.SEVERE, "getValue", e);
+		} 
+		if (str == null) {
+			// if not found by organization - get the client parameter
+			return getValue(Name, defaultValue, AD_Client_ID);
+		}
+		return (str.trim());
+	}
+	
+	/**
+	 * Get system configuration property of type string
+	 * @param Name
+	 * @param Client ID
+	 * @param Organization ID
+	 * @return String
+	 */
+	public static String getValue(String Name, int AD_Client_ID, int AD_Org_ID)
+	{
+		return (getValue(Name, null, AD_Client_ID, AD_Org_ID));
+	}
+	
+	/**
+	 * Get system configuration property of type int
+	 * @param Name
+	 * @param defaultValue
+	 * @param Client ID
+	 * @param Organization ID
+	 * @return int
+	 */
+	public static int getIntValue(String Name, int defaultValue, int AD_Client_ID, int AD_Org_ID)
+	{
+		String s = getValue(Name, AD_Client_ID, AD_Org_ID);
+		if (s == null)
+			return defaultValue; 
+		
+		if (s.length() == 0)
+			return defaultValue;
+		//
+		try
+		{
+			return Integer.parseInt(s);
+		}
+		catch (NumberFormatException e)
+		{
+			s_log.log(Level.SEVERE, "getIntValue (" + Name + ") = " + s, e);
+		}
+		return defaultValue;
+	}
+	
+	/**
+	 * Get system configuration property of type double
+	 * @param Name
+	 * @param defaultValue
+	 * @param Client ID
+	 * @param Organization ID
+	 * @return double
+	 */
+	public static double getDoubleValue(String Name, double defaultValue, int AD_Client_ID, int AD_Org_ID)
+	{
+		String s = getValue(Name, AD_Client_ID, AD_Org_ID);
+		if (s == null || s.length() == 0)
+			return defaultValue;
+		//
+		try
+		{
+			return Double.parseDouble(s);
+		}
+		catch (NumberFormatException e)
+		{
+			s_log.log(Level.SEVERE, "getDoubleValue (" + Name + ") = " + s, e);
+		}
+		return defaultValue;
+	}
+	
+	/**
+	 * Get system configuration property of type boolean
+	 * @param Name
+	 * @param defaultValue
+	 * @param Client ID
+	 * @param Organization ID
+	 * @return boolean
+	 */
+	public static boolean getBooleanValue(String Name, boolean defaultValue, int AD_Client_ID, int AD_Org_ID)
+	{
+		String s = getValue(Name, AD_Client_ID, AD_Org_ID);
+		if (s == null || s.length() == 0)
+			return defaultValue;
+		
+		if ("Y".equalsIgnoreCase(s))
+			return true;
+		else if ("N".equalsIgnoreCase(s))
+			return false;
+		else
+			return Boolean.valueOf(s).booleanValue();
+	}
+
+	/**************************************************************************
+	 * 	Before Save
+	 *	@param newRecord
+	 *	@return true if save
+	 */
+	protected boolean beforeSave (boolean newRecord)
+	{
+		log.fine("New=" + newRecord);
+		
+		if (getAD_Client_ID() != 0 || getAD_Org_ID() != 0) {
+			
+			// Get the configuration level from the System Record
+			String configLevel = null;
+			String sql = "SELECT ConfigurationLevel FROM AD_SysConfig WHERE Name=? AND AD_Client_ID = 0 AND AD_Org_ID = 0";
+			try
+			{
+				PreparedStatement pstmt = DB.prepareStatement(sql, null);
+				pstmt.setString(1, getName());
+				ResultSet rs = pstmt.executeQuery();
+				if (rs.next())
+					configLevel = rs.getString(1);
+				rs.close();
+				pstmt.close();
+			}
+			catch (SQLException e)
+			{
+				s_log.log(Level.SEVERE, "getValue", e);
+			}
+			
+			if (configLevel == null) {
+				// not found for system
+				// if saving an org parameter - look config in client
+				if (getAD_Org_ID() != 0) {
+					// Get the configuration level from the System Record
+					sql = "SELECT ConfigurationLevel FROM AD_SysConfig WHERE Name=? AND AD_Client_ID = ? AND AD_Org_ID = 0";
+					try
+					{
+						PreparedStatement pstmt = DB.prepareStatement(sql, null);
+						pstmt.setString(1, getName());
+						pstmt.setInt(2, getAD_Client_ID());
+						ResultSet rs = pstmt.executeQuery();
+						if (rs.next())
+							configLevel = rs.getString(1);
+						rs.close();
+						pstmt.close();
+					}
+					catch (SQLException e)
+					{
+						s_log.log(Level.SEVERE, "getValue", e);
+					}
+				}
+			}
+			
+			if (configLevel != null) {
+				
+				setConfigurationLevel(configLevel);
+				
+				// Disallow saving org parameter if the system parameter is marked as 'S' or 'C'
+				if (getAD_Org_ID() != 0 && 
+						(configLevel.equals(MSysConfig.CONFIGURATIONLEVEL_System) || 
+						 configLevel.equals(MSysConfig.CONFIGURATIONLEVEL_Client))) {
+					log.saveError( "Can't Save Org Level", "This is a system or client parameter, you can't save it as organization parameter" );
+					return false;
+				}
+
+				// Disallow saving client parameter if the system parameter is marked as 'S'
+				if (getAD_Client_ID() != 0 && configLevel.equals(MSysConfig.CONFIGURATIONLEVEL_System)) {
+					log.saveError( "Can't Save Client Level", "This is a system parameter, you can't save it as client parameter" );
+					return false;
+				}
+
+			} else {
+				
+				// fix possible wrong config level
+				if (getAD_Org_ID() != 0)
+					setConfigurationLevel(CONFIGURATIONLEVEL_Organization);
+				else if (getAD_Client_ID() != 0 && getConfigurationLevel().equals(MSysConfig.CONFIGURATIONLEVEL_System))
+					setConfigurationLevel(CONFIGURATIONLEVEL_Client);
+				
+			}
+
+		}
+		
+		return true;
+	}	//	beforeSave
+
+}	//	MSysConfig
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_AD_SysConfig.java b/base/src/org/compiere/model/X_AD_SysConfig.java
index d881ffdcc2..e4b090daa8 100644
--- a/base/src/org/compiere/model/X_AD_SysConfig.java
+++ b/base/src/org/compiere/model/X_AD_SysConfig.java
@@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_SysConfig
  *  @author Adempiere (generated) 
- *  @version Release 3.3.1b - $Id$ */
+ *  @version Release 3.3.1t - $Id$ */
 public class X_AD_SysConfig extends PO implements I_AD_SysConfig, I_Persistent 
 {
 
@@ -39,6 +39,8 @@ public class X_AD_SysConfig extends PO implements I_AD_SysConfig, I_Persistent
       /** if (AD_SysConfig_ID == 0)
         {
 			setAD_SysConfig_ID (0);
+			setEntityType (null);
+// U
 			setName (null);
 			setValue (null);
         } */
@@ -91,6 +93,38 @@ public class X_AD_SysConfig extends PO implements I_AD_SysConfig, I_Persistent
 		return ii.intValue();
 	}
 
+	/** ConfigurationLevel AD_Reference_ID=53222 */
+	public static final int CONFIGURATIONLEVEL_AD_Reference_ID=53222;
+	/** System = S */
+	public static final String CONFIGURATIONLEVEL_System = "S";
+	/** Client = C */
+	public static final String CONFIGURATIONLEVEL_Client = "C";
+	/** Organization = O */
+	public static final String CONFIGURATIONLEVEL_Organization = "O";
+	/** Set Configuration Level.
+		@param ConfigurationLevel 
+		Configuration Level for this parameter
+	  */
+	public void setConfigurationLevel (String ConfigurationLevel)
+	{
+
+		if (ConfigurationLevel == null || ConfigurationLevel.equals("S") || ConfigurationLevel.equals("C") || ConfigurationLevel.equals("O")); else throw new IllegalArgumentException ("ConfigurationLevel Invalid value - " + ConfigurationLevel + " - Reference_ID=53222 - S - C - O");
+		if (ConfigurationLevel != null && ConfigurationLevel.length() > 1)
+		{
+			log.warning("Length > 1 - truncated");
+			ConfigurationLevel = ConfigurationLevel.substring(0, 1);
+		}
+		set_Value (COLUMNNAME_ConfigurationLevel, ConfigurationLevel);
+	}
+
+	/** Get Configuration Level.
+		@return Configuration Level for this parameter
+	  */
+	public String getConfigurationLevel () 
+	{
+		return (String)get_Value(COLUMNNAME_ConfigurationLevel);
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
@@ -114,6 +148,31 @@ public class X_AD_SysConfig extends PO implements I_AD_SysConfig, I_Persistent
 		return (String)get_Value(COLUMNNAME_Description);
 	}
 
+	/** EntityType AD_Reference_ID=389 */
+	public static final int ENTITYTYPE_AD_Reference_ID=389;
+	/** Set Entity Type.
+		@param EntityType 
+		Dictionary Entity Type; Determines ownership and synchronization
+	  */
+	public void setEntityType (String EntityType)
+	{
+
+		if (EntityType.length() > 40)
+		{
+			log.warning("Length > 40 - truncated");
+			EntityType = EntityType.substring(0, 40);
+		}
+		set_Value (COLUMNNAME_EntityType, EntityType);
+	}
+
+	/** Get Entity Type.
+		@return Dictionary Entity Type; Determines ownership and synchronization
+	  */
+	public String getEntityType () 
+	{
+		return (String)get_Value(COLUMNNAME_EntityType);
+	}
+
 	/** Set Name.
 		@param Name 
 		Alphanumeric identifier of the entity
diff --git a/migration/331b-trunk/please_start_with_045.sql b/migration/331b-trunk/045_placeholder_branch350.sql
similarity index 100%
rename from migration/331b-trunk/please_start_with_045.sql
rename to migration/331b-trunk/045_placeholder_branch350.sql
diff --git a/migration/331b-trunk/046_FR1800371_SystemConfiguratorEnhancements.sql b/migration/331b-trunk/046_FR1800371_SystemConfiguratorEnhancements.sql
new file mode 100644
index 0000000000..32661d3fa0
--- /dev/null
+++ b/migration/331b-trunk/046_FR1800371_SystemConfiguratorEnhancements.sql
@@ -0,0 +1,232 @@
+-- Dec 15, 2007 12:31:13 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,Help,IsActive,IsAlwaysUpdateable,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSelectionColumn,IsSyncDatabase,IsTranslated,IsUpdateable,Name,ReadOnlyLogic,SeqNo,Updated,UpdatedBy,Version) VALUES (0,53270,1682,0,18,389,50009,'EntityType',TO_DATE('2007-12-15 12:31:11','YYYY-MM-DD HH24:MI:SS'),100,'U','Dictionary Entity Type; Determines ownership and synchronization','D',40,'The Entity Types "Dictionary", "Adempiere" and "Application" might be automatically synchronized and customizations deleted or overwritten.  
+
+For customizations, copy the entity and select "User"!','Y','N','N','N','N','Y','N','N','N','N','Y','Entity Type','@EntityType@=D',0,TO_DATE('2007-12-15 12:31:11','YYYY-MM-DD HH24:MI:SS'),100,1.000000000000)
+;
+
+-- Dec 15, 2007 12:31:13 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=53270 AND EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Column_ID!=t.AD_Column_ID)
+;
+
+-- Dec 15, 2007 12:31:24 PM COT
+-- FR 1800371 System Configurator Enhancements
+ALTER TABLE AD_SysConfig ADD EntityType VARCHAR2(40) DEFAULT 'U' NOT NULL
+;
+
+-- Dec 15, 2007 12:33:53 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Org_ID,ColumnName,Created,CreatedBy,Description,EntityType,Help,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,53229,0,'ConfigurationLevel',TO_DATE('2007-12-15 12:33:52','YYYY-MM-DD HH24:MI:SS'),100,'Configuration Level for this parameter','D','Configuration Level for this parameter
+S - just allowed system configuration
+C - client configurable parameter
+O - org configurable parameter','Y','Configuration Level','Configuration Level for this parameter',TO_DATE('2007-12-15 12:33:52','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Dec 15, 2007 12:33:53 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Description,Help,Name,PO_Description,PO_Help,PO_Name,PO_PrintName,PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Element_ID, t.Description,t.Help,t.Name,t.PO_Description,t.PO_Help,t.PO_Name,t.PO_PrintName,t.PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=53229 AND EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Element_ID!=t.AD_Element_ID)
+;
+
+-- Dec 15, 2007 12:34:46 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Reference (AD_Client_ID,AD_Org_ID,AD_Reference_ID,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,ValidationType) VALUES (0,0,53222,TO_DATE('2007-12-15 12:34:44','YYYY-MM-DD HH24:MI:SS'),100,'Configuration Level','D','Y','AD_SysConfig ConfigurationLevel',TO_DATE('2007-12-15 12:34:44','YYYY-MM-DD HH24:MI:SS'),100,'L')
+;
+
+-- Dec 15, 2007 12:34:46 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Reference_Trl (AD_Language,AD_Reference_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Reference_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Reference t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Reference_ID=53222 AND EXISTS (SELECT * FROM AD_Reference_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Reference_ID!=t.AD_Reference_ID)
+;
+
+-- Dec 15, 2007 12:35:24 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Reference_ID,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,53228,53222,TO_DATE('2007-12-15 12:35:20','YYYY-MM-DD HH24:MI:SS'),100,'Just allowed system configuration','D','Y','System',TO_DATE('2007-12-15 12:35:20','YYYY-MM-DD HH24:MI:SS'),100,'S')
+;
+
+-- Dec 15, 2007 12:35:24 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=53228 AND EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Ref_List_ID!=t.AD_Ref_List_ID)
+;
+
+-- Dec 15, 2007 12:35:43 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Reference_ID,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,53229,53222,TO_DATE('2007-12-15 12:35:42','YYYY-MM-DD HH24:MI:SS'),100,'Allowed system and client configuration','D','Y','Client',TO_DATE('2007-12-15 12:35:42','YYYY-MM-DD HH24:MI:SS'),100,'C')
+;
+
+-- Dec 15, 2007 12:35:43 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=53229 AND EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Ref_List_ID!=t.AD_Ref_List_ID)
+;
+
+-- Dec 15, 2007 12:36:00 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Reference_ID,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,53230,53222,TO_DATE('2007-12-15 12:36:00','YYYY-MM-DD HH24:MI:SS'),100,'Allowed system, client and organization configuration','D','Y','Organization',TO_DATE('2007-12-15 12:36:00','YYYY-MM-DD HH24:MI:SS'),100,'O')
+;
+
+-- Dec 15, 2007 12:36:01 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=53230 AND EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Ref_List_ID!=t.AD_Ref_List_ID)
+;
+
+-- Dec 15, 2007 12:36:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,Help,IsActive,IsAlwaysUpdateable,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSelectionColumn,IsSyncDatabase,IsTranslated,IsUpdateable,Name,SeqNo,Updated,UpdatedBy,Version) VALUES (0,53271,53229,0,17,53222,50009,'ConfigurationLevel',TO_DATE('2007-12-15 12:36:38','YYYY-MM-DD HH24:MI:SS'),100,'S','Configuration Level for this parameter','D',1,'Configuration Level for this parameter
+S - just allowed system configuration
+C - client configurable parameter
+O - org configurable parameter','Y','N','N','N','N','N','N','N','N','N','Y','Configuration Level',0,TO_DATE('2007-12-15 12:36:38','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Dec 15, 2007 12:36:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=53271 AND EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Column_ID!=t.AD_Column_ID)
+;
+
+-- Dec 15, 2007 12:36:53 PM COT
+-- FR 1800371 System Configurator Enhancements
+ALTER TABLE AD_SysConfig ADD ConfigurationLevel CHAR(1) DEFAULT 'S'
+;
+
+-- Dec 15, 2007 12:41:18 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,Created,CreatedBy,Description,DisplayLength,EntityType,Help,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,Updated,UpdatedBy) VALUES (0,53271,53285,0,50009,TO_DATE('2007-12-15 12:41:14','YYYY-MM-DD HH24:MI:SS'),100,'Configuration Level for this parameter',1,'D','Configuration Level for this parameter
+S - just allowed system configuration
+C - client configurable parameter
+O - org configurable parameter','Y','Y','Y','N','N','N','N','N','Configuration Level',TO_DATE('2007-12-15 12:41:14','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Dec 15, 2007 12:41:18 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=53285 AND EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Field_ID!=t.AD_Field_ID)
+;
+
+-- Dec 15, 2007 12:41:25 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,Created,CreatedBy,Description,DisplayLength,EntityType,Help,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,Updated,UpdatedBy) VALUES (0,53270,53286,0,50009,TO_DATE('2007-12-15 12:41:18','YYYY-MM-DD HH24:MI:SS'),100,'Dictionary Entity Type; Determines ownership and synchronization',40,'D','The Entity Types "Dictionary", "Adempiere" and "Application" might be automatically synchronized and customizations deleted or overwritten.  
+
+For customizations, copy the entity and select "User"!','Y','Y','Y','N','N','N','N','N','Entity Type',TO_DATE('2007-12-15 12:41:18','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Dec 15, 2007 12:41:26 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=53286 AND EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Field_ID!=t.AD_Field_ID)
+;
+
+-- Dec 15, 2007 12:41:38 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=50164
+;
+
+-- Dec 15, 2007 12:41:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=50163
+;
+
+-- Dec 15, 2007 12:41:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=50166
+;
+
+-- Dec 15, 2007 12:41:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=53286
+;
+
+-- Dec 15, 2007 12:41:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=53285
+;
+
+-- Dec 15, 2007 12:41:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=50161
+;
+
+-- Dec 15, 2007 12:42:07 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET DisplayLength=20,Updated=TO_DATE('2007-12-15 12:42:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=53286
+;
+
+-- Dec 15, 2007 12:42:18 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET DisplayLength=20, IsSameLine='Y',Updated=TO_DATE('2007-12-15 12:42:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=53285
+;
+
+-- Dec 15, 2007 12:49:08 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_DATE('2007-12-15 12:49:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50000
+;
+
+-- Dec 15, 2007 12:49:16 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_DATE('2007-12-15 12:49:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50005
+;
+
+-- Dec 15, 2007 12:49:26 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_DATE('2007-12-15 12:49:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50009
+;
+
+-- Dec 15, 2007 12:49:33 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_DATE('2007-12-15 12:49:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50010
+;
+
+-- Dec 15, 2007 12:49:42 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_DATE('2007-12-15 12:49:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50004
+;
+
+-- Dec 15, 2007 12:49:49 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_DATE('2007-12-15 12:49:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50006
+;
+
+-- Dec 15, 2007 12:49:58 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_DATE('2007-12-15 12:49:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50001
+;
+
+-- Dec 15, 2007 12:50:06 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_DATE('2007-12-15 12:50:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50007
+;
+
+-- Dec 15, 2007 12:50:14 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_DATE('2007-12-15 12:50:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50002
+;
+
+-- Dec 15, 2007 12:50:29 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_DATE('2007-12-15 12:50:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50008
+;
+
+-- Dec 15, 2007 12:50:51 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_DATE('2007-12-15 12:50:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50003
+;
+
+-- Dec 15, 2007 12:51:28 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Tab SET OrderByClause='Name',Updated=TO_DATE('2007-12-15 12:51:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=50009
+;
+
+-- Dec 15, 2007 1:24:58 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53009,0,TO_DATE('2007-12-15 13:24:57','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','This is a system or client parameter, you can''t save it as organization parameter','E',TO_DATE('2007-12-15 13:24:57','YYYY-MM-DD HH24:MI:SS'),100,'Can''t Save Org Level')
+;
+
+-- Dec 15, 2007 1:24:58 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53009 AND EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Message_ID!=t.AD_Message_ID)
+;
+
+-- Dec 15, 2007 1:25:17 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53010,0,TO_DATE('2007-12-15 13:25:16','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','This is a system parameter, you can''t save it as client parameter','E',TO_DATE('2007-12-15 13:25:16','YYYY-MM-DD HH24:MI:SS'),100,'Can''t Save Client Level')
+;
+
+-- Dec 15, 2007 1:25:17 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53010 AND EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Message_ID!=t.AD_Message_ID)
+;
diff --git a/migration/331b-trunk/postgresql/please_start_with_045.sql b/migration/331b-trunk/postgresql/045_placeholder_branch350.sql
similarity index 100%
rename from migration/331b-trunk/postgresql/please_start_with_045.sql
rename to migration/331b-trunk/postgresql/045_placeholder_branch350.sql
diff --git a/migration/331b-trunk/postgresql/046_FR1800371_SystemConfiguratorEnhancements.sql b/migration/331b-trunk/postgresql/046_FR1800371_SystemConfiguratorEnhancements.sql
new file mode 100644
index 0000000000..30a5256790
--- /dev/null
+++ b/migration/331b-trunk/postgresql/046_FR1800371_SystemConfiguratorEnhancements.sql
@@ -0,0 +1,232 @@
+-- Dec 15, 2007 12:31:13 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,Help,IsActive,IsAlwaysUpdateable,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSelectionColumn,IsSyncDatabase,IsTranslated,IsUpdateable,Name,ReadOnlyLogic,SeqNo,Updated,UpdatedBy,Version) VALUES (0,53270,1682,0,18,389,50009,'EntityType',TO_TIMESTAMP('2007-12-15 12:31:11','YYYY-MM-DD HH24:MI:SS'),100,'U','Dictionary Entity Type; Determines ownership and synchronization','D',40,'The Entity Types "Dictionary", "Adempiere" and "Application" might be automatically synchronized and customizations deleted or overwritten.  
+
+For customizations, copy the entity and select "User"!','Y','N','N','N','N','Y','N','N','N','N','Y','Entity Type','@EntityType@=D',0,TO_TIMESTAMP('2007-12-15 12:31:11','YYYY-MM-DD HH24:MI:SS'),100,1.000000000000)
+;
+
+-- Dec 15, 2007 12:31:13 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=53270 AND EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Column_ID!=t.AD_Column_ID)
+;
+
+-- Dec 15, 2007 12:31:24 PM COT
+-- FR 1800371 System Configurator Enhancements
+ALTER TABLE AD_SysConfig ADD COLUMN EntityType VARCHAR(40) DEFAULT 'U' NOT NULL
+;
+
+-- Dec 15, 2007 12:33:53 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Org_ID,ColumnName,Created,CreatedBy,Description,EntityType,Help,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,53229,0,'ConfigurationLevel',TO_TIMESTAMP('2007-12-15 12:33:52','YYYY-MM-DD HH24:MI:SS'),100,'Configuration Level for this parameter','D','Configuration Level for this parameter
+S - just allowed system configuration
+C - client configurable parameter
+O - org configurable parameter','Y','Configuration Level','Configuration Level for this parameter',TO_TIMESTAMP('2007-12-15 12:33:52','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Dec 15, 2007 12:33:53 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Description,Help,Name,PO_Description,PO_Help,PO_Name,PO_PrintName,PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Element_ID, t.Description,t.Help,t.Name,t.PO_Description,t.PO_Help,t.PO_Name,t.PO_PrintName,t.PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=53229 AND EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Element_ID!=t.AD_Element_ID)
+;
+
+-- Dec 15, 2007 12:34:46 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Reference (AD_Client_ID,AD_Org_ID,AD_Reference_ID,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,ValidationType) VALUES (0,0,53222,TO_TIMESTAMP('2007-12-15 12:34:44','YYYY-MM-DD HH24:MI:SS'),100,'Configuration Level','D','Y','AD_SysConfig ConfigurationLevel',TO_TIMESTAMP('2007-12-15 12:34:44','YYYY-MM-DD HH24:MI:SS'),100,'L')
+;
+
+-- Dec 15, 2007 12:34:46 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Reference_Trl (AD_Language,AD_Reference_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Reference_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Reference t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Reference_ID=53222 AND EXISTS (SELECT * FROM AD_Reference_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Reference_ID!=t.AD_Reference_ID)
+;
+
+-- Dec 15, 2007 12:35:24 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Reference_ID,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,53228,53222,TO_TIMESTAMP('2007-12-15 12:35:20','YYYY-MM-DD HH24:MI:SS'),100,'Just allowed system configuration','D','Y','System',TO_TIMESTAMP('2007-12-15 12:35:20','YYYY-MM-DD HH24:MI:SS'),100,'S')
+;
+
+-- Dec 15, 2007 12:35:24 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=53228 AND EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Ref_List_ID!=t.AD_Ref_List_ID)
+;
+
+-- Dec 15, 2007 12:35:43 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Reference_ID,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,53229,53222,TO_TIMESTAMP('2007-12-15 12:35:42','YYYY-MM-DD HH24:MI:SS'),100,'Allowed system and client configuration','D','Y','Client',TO_TIMESTAMP('2007-12-15 12:35:42','YYYY-MM-DD HH24:MI:SS'),100,'C')
+;
+
+-- Dec 15, 2007 12:35:43 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=53229 AND EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Ref_List_ID!=t.AD_Ref_List_ID)
+;
+
+-- Dec 15, 2007 12:36:01 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List (AD_Client_ID,AD_Org_ID,AD_Ref_List_ID,AD_Reference_ID,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,53230,53222,TO_TIMESTAMP('2007-12-15 12:36:00','YYYY-MM-DD HH24:MI:SS'),100,'Allowed system, client and organization configuration','D','Y','Organization',TO_TIMESTAMP('2007-12-15 12:36:00','YYYY-MM-DD HH24:MI:SS'),100,'O')
+;
+
+-- Dec 15, 2007 12:36:01 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=53230 AND EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Ref_List_ID!=t.AD_Ref_List_ID)
+;
+
+-- Dec 15, 2007 12:36:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,Help,IsActive,IsAlwaysUpdateable,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSelectionColumn,IsSyncDatabase,IsTranslated,IsUpdateable,Name,SeqNo,Updated,UpdatedBy,Version) VALUES (0,53271,53229,0,17,53222,50009,'ConfigurationLevel',TO_TIMESTAMP('2007-12-15 12:36:38','YYYY-MM-DD HH24:MI:SS'),100,'S','Configuration Level for this parameter','D',1,'Configuration Level for this parameter
+S - just allowed system configuration
+C - client configurable parameter
+O - org configurable parameter','Y','N','N','N','N','N','N','N','N','N','Y','Configuration Level',0,TO_TIMESTAMP('2007-12-15 12:36:38','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Dec 15, 2007 12:36:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=53271 AND EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Column_ID!=t.AD_Column_ID)
+;
+
+-- Dec 15, 2007 12:36:53 PM COT
+-- FR 1800371 System Configurator Enhancements
+ALTER TABLE AD_SysConfig ADD COLUMN ConfigurationLevel CHAR(1) DEFAULT 'S' 
+;
+
+-- Dec 15, 2007 12:41:18 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,Created,CreatedBy,Description,DisplayLength,EntityType,Help,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,Updated,UpdatedBy) VALUES (0,53271,53285,0,50009,TO_TIMESTAMP('2007-12-15 12:41:14','YYYY-MM-DD HH24:MI:SS'),100,'Configuration Level for this parameter',1,'D','Configuration Level for this parameter
+S - just allowed system configuration
+C - client configurable parameter
+O - org configurable parameter','Y','Y','Y','N','N','N','N','N','Configuration Level',TO_TIMESTAMP('2007-12-15 12:41:14','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Dec 15, 2007 12:41:18 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=53285 AND EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Field_ID!=t.AD_Field_ID)
+;
+
+-- Dec 15, 2007 12:41:25 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,Created,CreatedBy,Description,DisplayLength,EntityType,Help,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,Updated,UpdatedBy) VALUES (0,53270,53286,0,50009,TO_TIMESTAMP('2007-12-15 12:41:18','YYYY-MM-DD HH24:MI:SS'),100,'Dictionary Entity Type; Determines ownership and synchronization',40,'D','The Entity Types "Dictionary", "Adempiere" and "Application" might be automatically synchronized and customizations deleted or overwritten.  
+
+For customizations, copy the entity and select "User"!','Y','Y','Y','N','N','N','N','N','Entity Type',TO_TIMESTAMP('2007-12-15 12:41:18','YYYY-MM-DD HH24:MI:SS'),100)
+;
+
+-- Dec 15, 2007 12:41:26 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=53286 AND EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Field_ID!=t.AD_Field_ID)
+;
+
+-- Dec 15, 2007 12:41:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=50164
+;
+
+-- Dec 15, 2007 12:41:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=50163
+;
+
+-- Dec 15, 2007 12:41:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=50166
+;
+
+-- Dec 15, 2007 12:41:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=53286
+;
+
+-- Dec 15, 2007 12:41:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=53285
+;
+
+-- Dec 15, 2007 12:41:39 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=50161
+;
+
+-- Dec 15, 2007 12:42:07 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET DisplayLength=20,Updated=TO_TIMESTAMP('2007-12-15 12:42:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=53286
+;
+
+-- Dec 15, 2007 12:42:18 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Field SET DisplayLength=20, IsSameLine='Y',Updated=TO_TIMESTAMP('2007-12-15 12:42:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=53285
+;
+
+-- Dec 15, 2007 12:49:08 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_TIMESTAMP('2007-12-15 12:49:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50000
+;
+
+-- Dec 15, 2007 12:49:17 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_TIMESTAMP('2007-12-15 12:49:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50005
+;
+
+-- Dec 15, 2007 12:49:26 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_TIMESTAMP('2007-12-15 12:49:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50009
+;
+
+-- Dec 15, 2007 12:49:33 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_TIMESTAMP('2007-12-15 12:49:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50010
+;
+
+-- Dec 15, 2007 12:49:42 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_TIMESTAMP('2007-12-15 12:49:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50004
+;
+
+-- Dec 15, 2007 12:49:49 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_TIMESTAMP('2007-12-15 12:49:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50006
+;
+
+-- Dec 15, 2007 12:49:59 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_TIMESTAMP('2007-12-15 12:49:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50001
+;
+
+-- Dec 15, 2007 12:50:06 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_TIMESTAMP('2007-12-15 12:50:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50007
+;
+
+-- Dec 15, 2007 12:50:14 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_TIMESTAMP('2007-12-15 12:50:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50002
+;
+
+-- Dec 15, 2007 12:50:29 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_TIMESTAMP('2007-12-15 12:50:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50008
+;
+
+-- Dec 15, 2007 12:50:51 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_SysConfig SET EntityType='D',Updated=TO_TIMESTAMP('2007-12-15 12:50:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50003
+;
+
+-- Dec 15, 2007 12:51:28 PM COT
+-- FR 1800371 System Configurator Enhancements
+UPDATE AD_Tab SET OrderByClause='Name',Updated=TO_TIMESTAMP('2007-12-15 12:51:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=50009
+;
+
+-- Dec 15, 2007 1:24:58 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53009,0,TO_TIMESTAMP('2007-12-15 13:24:57','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','This is a system or client parameter, you can''t save it as organization parameter','E',TO_TIMESTAMP('2007-12-15 13:24:57','YYYY-MM-DD HH24:MI:SS'),100,'Can''t Save Org Level')
+;
+
+-- Dec 15, 2007 1:24:59 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53009 AND EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Message_ID!=t.AD_Message_ID)
+;
+
+-- Dec 15, 2007 1:25:17 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Message (AD_Client_ID,AD_Message_ID,AD_Org_ID,Created,CreatedBy,EntityType,IsActive,MsgText,MsgType,Updated,UpdatedBy,Value) VALUES (0,53010,0,TO_TIMESTAMP('2007-12-15 13:25:16','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','This is a system parameter, you can''t save it as client parameter','E',TO_TIMESTAMP('2007-12-15 13:25:16','YYYY-MM-DD HH24:MI:SS'),100,'Can''t Save Client Level')
+;
+
+-- Dec 15, 2007 1:25:17 PM COT
+-- FR 1800371 System Configurator Enhancements
+INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=53010 AND EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language!=l.AD_Language OR tt.AD_Message_ID!=t.AD_Message_ID)
+;
\ No newline at end of file