From 3d53cf43db5037979aa42fdb5455a9e6d94cf28e Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 29 May 2014 16:31:14 -0500 Subject: [PATCH] IDEMPIERE-236 bring hardcoded MSysConfig keys and order --- .../compiere/process/ProductionCreate.java | 4 +- .../org/compiere/model/MBPartnerLocation.java | 4 +- .../src/org/compiere/model/MClient.java | 15 +- .../src/org/compiere/model/MPInstance.java | 10 +- .../src/org/compiere/model/MPayment.java | 12 +- .../src/org/compiere/model/MProduction.java | 6 +- .../src/org/compiere/model/MSysConfig.java | 182 +++++++++--------- .../src/org/compiere/util/Login.java | 2 +- .../webui/dashboard/CalendarWindow.java | 4 +- .../webui/factory/ButtonFactory.java | 6 +- .../org/adempiere/webui/panel/LoginPanel.java | 2 +- .../src/org/adempiere/webui/theme/ITheme.java | 3 - .../adempiere/webui/theme/ThemeManager.java | 4 +- .../adempiere/webui/window/ZkJRViewer.java | 4 +- .../org/compiere/apps/form/Allocation.java | 4 +- 15 files changed, 128 insertions(+), 134 deletions(-) diff --git a/org.adempiere.base.process/src/org/compiere/process/ProductionCreate.java b/org.adempiere.base.process/src/org/compiere/process/ProductionCreate.java index 353e739b8e..d6bcac1c9f 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ProductionCreate.java +++ b/org.adempiere.base.process/src/org/compiere/process/ProductionCreate.java @@ -83,7 +83,7 @@ public class ProductionCreate extends SvrProcess { { costPercentageDiff = Env.ZERO; String msg = "Could not retrieve costs"; - if (MSysConfig.getBooleanValue("MFG_ValidateCostsOnCreate", false, getAD_Client_ID())) { + if (MSysConfig.getBooleanValue(MSysConfig.MFG_ValidateCostsOnCreate, false, getAD_Client_ID())) { throw new AdempiereUserError(msg); } else { log.warning(msg); @@ -141,7 +141,7 @@ public class ProductionCreate extends SvrProcess { if (!costsOK(M_Product_ID)) { String msg = "Excessive difference in standard costs"; - if (MSysConfig.getBooleanValue("MFG_ValidateCostsDifferenceOnCreate", false, getAD_Client_ID())) { + if (MSysConfig.getBooleanValue(MSysConfig.MFG_ValidateCostsDifferenceOnCreate, false, getAD_Client_ID())) { throw new AdempiereUserError("Excessive difference in standard costs"); } else { log.warning(msg); diff --git a/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java b/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java index 49ad562d07..86d884d207 100644 --- a/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java +++ b/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java @@ -35,7 +35,7 @@ public class MBPartnerLocation extends X_C_BPartner_Location { /** * */ - private static final long serialVersionUID = 1062151267747257338L; + private static final long serialVersionUID = -8412652367051443276L; /** * Get Locations for BPartner @@ -227,7 +227,7 @@ public class MBPartnerLocation extends X_C_BPartner_Location { public String getBPLocName(MLocation address) { m_uniqueName = getName(); - m_unique = MSysConfig.getIntValue("START_VALUE_BPLOCATION_NAME", 0, + m_unique = MSysConfig.getIntValue(MSysConfig.START_VALUE_BPLOCATION_NAME, 0, getAD_Client_ID(), getAD_Org_ID()); if (m_unique < 0 || m_unique > 4) m_unique = 0; diff --git a/org.adempiere.base/src/org/compiere/model/MClient.java b/org.adempiere.base/src/org/compiere/model/MClient.java index aa2067c268..51a06cd44d 100644 --- a/org.adempiere.base/src/org/compiere/model/MClient.java +++ b/org.adempiere.base/src/org/compiere/model/MClient.java @@ -17,9 +17,6 @@ *****************************************************************************/ package org.compiere.model; -import static org.compiere.model.MSysConfig.CLIENT_ACCOUNTING; -import static org.compiere.model.MSysConfig.MAIL_SEND_CREDENTIALS; - import java.io.File; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -59,7 +56,7 @@ public class MClient extends X_AD_Client /** * */ - private static final long serialVersionUID = 3043792947325698506L; + private static final long serialVersionUID = -4479164806149932775L; /** * Get client @@ -922,21 +919,21 @@ public class MClient extends X_AD_Client private static final String CLIENT_ACCOUNTING_IMMEDIATE = "I"; public static boolean isClientAccounting() { - String ca = MSysConfig.getValue(CLIENT_ACCOUNTING, + String ca = MSysConfig.getValue(MSysConfig.CLIENT_ACCOUNTING, CLIENT_ACCOUNTING_QUEUE, // default Env.getAD_Client_ID(Env.getCtx())); return (ca.equalsIgnoreCase(CLIENT_ACCOUNTING_IMMEDIATE) || ca.equalsIgnoreCase(CLIENT_ACCOUNTING_QUEUE)); } public static boolean isClientAccountingQueue() { - String ca = MSysConfig.getValue(CLIENT_ACCOUNTING, + String ca = MSysConfig.getValue(MSysConfig.CLIENT_ACCOUNTING, CLIENT_ACCOUNTING_QUEUE, // default Env.getAD_Client_ID(Env.getCtx())); return ca.equalsIgnoreCase(CLIENT_ACCOUNTING_QUEUE); } public static boolean isClientAccountingImmediate() { - String ca = MSysConfig.getValue(CLIENT_ACCOUNTING, + String ca = MSysConfig.getValue(MSysConfig.CLIENT_ACCOUNTING, CLIENT_ACCOUNTING_QUEUE, // default Env.getAD_Client_ID(Env.getCtx())); return ca.equalsIgnoreCase(CLIENT_ACCOUNTING_IMMEDIATE); @@ -1086,14 +1083,14 @@ public class MClient extends X_AD_Client private static final String MAIL_SEND_CREDENTIALS_SYSTEM = "S"; public static boolean isSendCredentialsClient() { - String msc = MSysConfig.getValue(MAIL_SEND_CREDENTIALS, + String msc = MSysConfig.getValue(MSysConfig.MAIL_SEND_CREDENTIALS, MAIL_SEND_CREDENTIALS_USER, // default Env.getAD_Client_ID(Env.getCtx())); return (MAIL_SEND_CREDENTIALS_CLIENT.equalsIgnoreCase(msc)); } public static boolean isSendCredentialsSystem() { - String msc = MSysConfig.getValue(MAIL_SEND_CREDENTIALS, + String msc = MSysConfig.getValue(MSysConfig.MAIL_SEND_CREDENTIALS, MAIL_SEND_CREDENTIALS_USER, // default Env.getAD_Client_ID(Env.getCtx())); return (MAIL_SEND_CREDENTIALS_SYSTEM.equalsIgnoreCase(msc)); diff --git a/org.adempiere.base/src/org/compiere/model/MPInstance.java b/org.adempiere.base/src/org/compiere/model/MPInstance.java index 26855eab54..9b6008d219 100644 --- a/org.adempiere.base/src/org/compiere/model/MPInstance.java +++ b/org.adempiere.base/src/org/compiere/model/MPInstance.java @@ -49,12 +49,12 @@ import org.osgi.service.event.Event; */ public class MPInstance extends X_AD_PInstance { - /** + /** * */ - private static final long serialVersionUID = -4047766735041088419L; - - public static final String ON_RUNNING_JOB_CHANGED_TOPIC = "onRunningJobChanged"; + private static final long serialVersionUID = 558778359873793799L; + + public static final String ON_RUNNING_JOB_CHANGED_TOPIC = "onRunningJobChanged"; private static CLogger s_log = CLogger.getCLogger (MPInstance.class); @@ -395,7 +395,7 @@ public class MPInstance extends X_AD_PInstance } // unnamed instances - int lastRunCount = MSysConfig.getIntValue("LASTRUN_RECORD_COUNT", 5, Env.getAD_Client_ID(ctx)); + int lastRunCount = MSysConfig.getIntValue(MSysConfig.LASTRUN_RECORD_COUNT, 5, Env.getAD_Client_ID(ctx)); if (lastRunCount > 0) { // using JDBC instead of Query for performance reasons, AD_PInstance can be huge String sql = "SELECT * FROM AD_PInstance " diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java index 2469851197..4129b23b46 100644 --- a/org.adempiere.base/src/org/compiere/model/MPayment.java +++ b/org.adempiere.base/src/org/compiere/model/MPayment.java @@ -80,12 +80,10 @@ import org.compiere.util.ValueNamePair; public class MPayment extends X_C_Payment implements DocAction, ProcessCall, PaymentInterface { - - - /** - * - */ - private static final long serialVersionUID = 6200327948230438741L; + /** + * + */ + private static final long serialVersionUID = -3426445843281140181L; /** * Get Payments Of BPartner @@ -1625,7 +1623,7 @@ public class MPayment extends X_C_Payment sumPaymentAllocates = sumPaymentAllocates.add(pAlloc.getAmount()); if (getPayAmt().compareTo(sumPaymentAllocates) != 0) { if (isReceipt() && getPayAmt().compareTo(sumPaymentAllocates) < 0) { - if (MSysConfig.getBooleanValue("ALLOW_OVER_APPLIED_PAYMENT", false, Env.getAD_Client_ID(Env.getCtx()))) { + if (MSysConfig.getBooleanValue(MSysConfig.ALLOW_OVER_APPLIED_PAYMENT, false, Env.getAD_Client_ID(Env.getCtx()))) { return true; } } diff --git a/org.adempiere.base/src/org/compiere/model/MProduction.java b/org.adempiere.base/src/org/compiere/model/MProduction.java index 20a6766009..6826a6dbb5 100644 --- a/org.adempiere.base/src/org/compiere/model/MProduction.java +++ b/org.adempiere.base/src/org/compiere/model/MProduction.java @@ -26,7 +26,7 @@ public class MProduction extends X_M_Production implements DocAction { /** * */ - private static final long serialVersionUID = -9055468125493188165L; + private static final long serialVersionUID = 2222265936552140706L; /** * @@ -454,7 +454,7 @@ public class MProduction extends X_M_Production implements DocAction { if (!costsOK(M_Product_ID)) { msg = "Excessive difference in standard costs"; - if (MSysConfig.getBooleanValue("MFG_ValidateCostsDifferenceOnCreate", false, getAD_Client_ID())) { + if (MSysConfig.getBooleanValue(MSysConfig.MFG_ValidateCostsDifferenceOnCreate, false, getAD_Client_ID())) { return msg; } else { log.warning(msg); @@ -503,7 +503,7 @@ public class MProduction extends X_M_Production implements DocAction { { costPercentageDiff = Env.ZERO; String msg = "Could not retrieve costs"; - if (MSysConfig.getBooleanValue("MFG_ValidateCostsOnCreate", false, getAD_Client_ID())) { + if (MSysConfig.getBooleanValue(MSysConfig.MFG_ValidateCostsOnCreate, false, getAD_Client_ID())) { throw new AdempiereUserError(msg); } else { log.warning(msg); diff --git a/org.adempiere.base/src/org/compiere/model/MSysConfig.java b/org.adempiere.base/src/org/compiere/model/MSysConfig.java index 8f628ff26d..a16e15b2a0 100644 --- a/org.adempiere.base/src/org/compiere/model/MSysConfig.java +++ b/org.adempiere.base/src/org/compiere/model/MSysConfig.java @@ -42,94 +42,102 @@ public class MSysConfig extends X_AD_SysConfig /** * */ - private static final long serialVersionUID = 8799369533278239017L; + private static final long serialVersionUID = 7850399904723862767L; - public final static String PDF_FONT_DIR = "PDF_FONT_DIR"; - public final static String TWOPACK_HANDLE_TRANSLATIONS = "2PACK_HANDLE_TRANSLATIONS"; - public static final String ZK_DESKTOP_CLASS = "ZK_DESKTOP_CLASS"; - public static final String CASH_AS_PAYMENT = "CASH_AS_PAYMENT"; - public static final String MAX_ACTIVITIES_IN_LIST = "MAX_ACTIVITIES_IN_LIST"; - public static final String ZK_ROOT_FOLDER_BROWSER = "ZK_ROOT_FOLDER_BROWSER"; - public static final String ZK_PAGING_SIZE = "ZK_PAGING_SIZE"; - public static final String ZK_GRID_EDIT_MODELESS = "ZK_GRID_EDIT_MODELESS"; - public static final String ZK_DASHBOARD_REFRESH_INTERVAL = "ZK_DASHBOARD_REFRESH_INTERVAL"; - public static final String RecentItems_MaxShown = "RecentItems_MaxShown"; - public static final String USE_EMAIL_FOR_LOGIN = "USE_EMAIL_FOR_LOGIN"; - public static final String LOGIN_SHOW_RESETPASSWORD = "LOGIN_SHOW_RESETPASSWORD"; - public static final String ALogin_ShowOneRole = "ALogin_ShowOneRole"; - public static final String ZK_BROWSER_ICON = "ZK_BROWSER_ICON"; - public static final String ZK_BROWSER_TITLE = "ZK_BROWSER_TITLE"; - public static final String ZK_LOGO_LARGE = "ZK_LOGO_LARGE"; - public static final String ZK_LOGO_SMALL = "ZK_LOGO_SMALL"; - public static final String WEBUI_LOGOURL = "WEBUI_LOGOURL"; - public static final String LOCATION_MAX_CITY_ROWS = "LOCATION_MAX_CITY_ROWS"; - public static final String ZK_REPORT_FORM_OUTPUT_TYPE = "ZK_REPORT_FORM_OUTPUT_TYPE"; - public static final String ZK_REPORT_TABLE_OUTPUT_TYPE = "ZK_REPORT_TABLE_OUTPUT_TYPE"; - public static final String MENU_INFOUPDATER_SLEEP_MS = "MENU_INFOUPDATER_SLEEP_MS"; - public static final String SYSCONFIG_INFO_DOUBLECLICKTOGGLESSELECTION = "SYSCONFIG_INFO_DOUBLECLICKTOGGLESSELECTION"; - public static final String SYSCONFIG_INFO_DEFAULTSELECTED = "SYSCONFIG_INFO_DEFAULTSELECTED"; - public static final String DICTIONARY_ID_USE_CENTRALIZED_ID = "DICTIONARY_ID_USE_CENTRALIZED_ID"; - public static final String PROJECT_ID_USE_CENTRALIZED_ID = "PROJECT_ID_USE_CENTRALIZED_ID"; - public static final String SYSTEM_NATIVE_SEQUENCE = "SYSTEM_NATIVE_SEQUENCE"; - public static final String START_VALUE_BPLOCATION_NAME = "START_VALUE_BPLOCATION_NAME"; - public static final String CLIENT_ACCOUNTING = "CLIENT_ACCOUNTING"; - public static final String CHECK_CREDIT_ON_PREPAY_ORDER = "CHECK_CREDIT_ON_PREPAY_ORDER"; - public static final String CHECK_CREDIT_ON_CASH_POS_ORDER = "CHECK_CREDIT_ON_CASH_POS_ORDER"; - public static final String Invoice_ReverseUseNewNumber = "Invoice_ReverseUseNewNumber"; - public static final String PROJECT_ID_COMMENTS = "PROJECT_ID_COMMENTS"; - public static final String DICTIONARY_ID_COMMENTS = "DICTIONARY_ID_COMMENTS"; - public static final String LOCATION_MAPS_URL_PREFIX = "LOCATION_MAPS_URL_PREFIX"; - public static final String LOCATION_MAPS_ROUTE_PREFIX = "LOCATION_MAPS_ROUTE_PREFIX"; - public static final String LOCATION_MAPS_SOURCE_ADDRESS = "LOCATION_MAPS_SOURCE_ADDRESS"; - public static final String LOCATION_MAPS_DESTINATION_ADDRESS = "LOCATION_MAPS_DESTINATION_ADDRESS"; - public static final String PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CREDIT_CARD = "PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CREDIT_CARD"; - public static final String PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_PAYMENT = "PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_PAYMENT"; - public static final String PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_RECEIPT = "PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_RECEIPT"; - public static final String RecentItems_MaxSaved = "RecentItems_MaxSaved"; - public static final String DICTIONARY_ID_WEBSITE = "DICTIONARY_ID_WEBSITE"; - public static final String DICTIONARY_ID_USER = "DICTIONARY_ID_USER"; - public static final String DICTIONARY_ID_PASSWORD = "DICTIONARY_ID_PASSWORD"; - public static final String PROJECT_ID_WEBSITE = "PROJECT_ID_WEBSITE"; - public static final String PROJECT_ID_USER = "PROJECT_ID_USER"; - public static final String PROJECT_ID_PASSWORD = "PROJECT_ID_PASSWORD"; - public static final String PROJECT_ID_PROJECT = "PROJECT_ID_PROJECT"; - public static final String ZK_LOGIN_ALLOW_REMEMBER_ME = "ZK_LOGIN_ALLOW_REMEMBER_ME"; - public static final String SWING_LOGIN_ALLOW_REMEMBER_ME = "SWING_LOGIN_ALLOW_REMEMBER_ME"; - public static final String USER_PASSWORD_HASH = "USER_PASSWORD_HASH"; - public static final String USER_LOCKING_MAX_ACCOUNT_LOCK_MINUTES = "USER_LOCKING_MAX_ACCOUNT_LOCK_MINUTES"; - public static final String USER_LOCKING_MAX_LOGIN_ATTEMPT = "USER_LOCKING_MAX_LOGIN_ATTEMPT"; - public static final String USER_LOCKING_MAX_INACTIVE_PERIOD_DAY = "USER_LOCKING_MAX_INACTIVE_PERIOD_DAY"; - public static final String USER_LOCKING_MAX_PASSWORD_AGE_DAY = "USER_LOCKING_MAX_PASSWORD_AGE_DAY"; - public static final String CHANGE_PASSWORD_MUST_DIFFER = "CHANGE_PASSWORD_MUST_DIFFER"; - public static final String ProductUOMConversionUOMValidate = "ProductUOMConversionUOMValidate"; - public static final String ProductUOMConversionRateValidate = "ProductUOMConversionRateValidate"; - public static final String SYSTEM_INSERT_CHANGELOG = "SYSTEM_INSERT_CHANGELOG"; - public static final String REPORT_SWAP_MAX_ROWS = "REPORT_SWAP_MAX_ROWS"; - public static final String JASPER_SWAP_MAX_PAGES = "JASPER_SWAP_MAX_PAGES"; - public static final String ALERT_SEND_ATTACHMENT_AS_XLS = "ALERT_SEND_ATTACHMENT_AS_XLS"; - public static final String SWING_OVERRIDE_TEXT_AREA_BEHAVIOUR = "SWING_OVERRIDE_TEXT_AREA_BEHAVIOUR"; - public static final String MAIL_SEND_BCC_TO_ADDRESS = "MAIL_SEND_BCC_TO_ADDRESS"; - public static final String MAIL_SEND_BCC_TO_FROM = "MAIL_SEND_BCC_TO_FROM"; - public static final String MAIL_SEND_CREDENTIALS = "MAIL_SEND_CREDENTIALS"; - public static final String REAL_TIME_POS = "REAL_TIME_POS"; - public static final String SHIPPING_DEFAULT_WEIGHT_PER_PACKAGE = "SHIPPING_DEFAULT_WEIGHT_PER_PACKAGE"; - public static final String SHIPPING_SAVE_REQUEST_RESPONSE_LOG = "SHIPPING_SAVE_REQUEST_RESPONSE_LOG"; - public static final String DOCACTIONBUTTON_SHOWACTIONNAME = "DOCACTIONBUTTON_SHOWACTIONNAME"; - public static final String ZK_MAX_UPLOAD_SIZE = "ZK_MAX_UPLOAD_SIZE"; - public static final String CALENDAR_ALTERNATE_TIMEZONE = "CALENDAR_ALTERNATE_TIMEZONE"; - public static final String ZK_REPORT_JASPER_OUTPUT_TYPE = "ZK_REPORT_JASPER_OUTPUT_TYPE"; - public static final String ADDRESS_VALIDATION = "ADDRESS_VALIDATION"; - public static final String TAX_SAVE_REQUEST_RESPONSE_LOG = "TAX_SAVE_REQUEST_RESPONSE_LOG"; - public static final String ADDRESS_SAVE_REQUEST_RESPONSE_LOG = "ADDRESS_SAVE_REQUEST_RESPONSE_LOG"; - public static final String VALIDATE_MATCHING_TO_ORDERED_QTY = "VALIDATE_MATCHING_TO_ORDERED_QTY"; - - public static final String BACKGROUND_JOB_ALLOWED = "BACKGROUND_JOB_ALLOWED"; - public static final String BACKGROUND_JOB_BY_DEFAULT = "BACKGROUND_JOB_BY_DEFAULT"; - public static final String BACKGROUND_JOB_MAX_IN_SYSTEM = "BACKGROUND_JOB_MAX_IN_SYSTEM"; - public static final String BACKGROUND_JOB_MAX_PER_CLIENT = "BACKGROUND_JOB_MAX_PER_CLIENT"; - public static final String BACKGROUND_JOB_MAX_PER_USER = "BACKGROUND_JOB_MAX_PER_USER"; - public static final String DPVIEWS_SHOWINFOACCOUNT = "DPViews_ShowInfoAccount"; - public static final String DPVIEWS_SHOWINFOSCHEDULE = "DPViews_ShowInfoSchedule"; + public static final String ADDRESS_SAVE_REQUEST_RESPONSE_LOG = "ADDRESS_SAVE_REQUEST_RESPONSE_LOG"; + public static final String ADDRESS_VALIDATION = "ADDRESS_VALIDATION"; + public static final String ALERT_SEND_ATTACHMENT_AS_XLS = "ALERT_SEND_ATTACHMENT_AS_XLS"; + public static final String ALLOW_APPLY_PAYMENT_TO_CREDITMEMO = "ALLOW_APPLY_PAYMENT_TO_CREDITMEMO"; + public static final String ALLOW_OVER_APPLIED_PAYMENT = "ALLOW_OVER_APPLIED_PAYMENT"; + public static final String ALogin_ShowOneRole = "ALogin_ShowOneRole"; + public static final String BACKGROUND_JOB_ALLOWED = "BACKGROUND_JOB_ALLOWED"; + public static final String BACKGROUND_JOB_BY_DEFAULT = "BACKGROUND_JOB_BY_DEFAULT"; + public static final String BACKGROUND_JOB_MAX_IN_SYSTEM = "BACKGROUND_JOB_MAX_IN_SYSTEM"; + public static final String BACKGROUND_JOB_MAX_PER_CLIENT = "BACKGROUND_JOB_MAX_PER_CLIENT"; + public static final String BACKGROUND_JOB_MAX_PER_USER = "BACKGROUND_JOB_MAX_PER_USER"; + public static final String CALENDAR_ALTERNATE_TIMEZONE = "CALENDAR_ALTERNATE_TIMEZONE"; + public static final String CASH_AS_PAYMENT = "CASH_AS_PAYMENT"; + public static final String CHANGE_PASSWORD_MUST_DIFFER = "CHANGE_PASSWORD_MUST_DIFFER"; + public static final String CHECK_CREDIT_ON_CASH_POS_ORDER = "CHECK_CREDIT_ON_CASH_POS_ORDER"; + public static final String CHECK_CREDIT_ON_PREPAY_ORDER = "CHECK_CREDIT_ON_PREPAY_ORDER"; + public static final String CLIENT_ACCOUNTING = "CLIENT_ACCOUNTING"; + public static final String DICTIONARY_ID_COMMENTS = "DICTIONARY_ID_COMMENTS"; + public static final String DICTIONARY_ID_PASSWORD = "DICTIONARY_ID_PASSWORD"; + public static final String DICTIONARY_ID_USE_CENTRALIZED_ID = "DICTIONARY_ID_USE_CENTRALIZED_ID"; + public static final String DICTIONARY_ID_USER = "DICTIONARY_ID_USER"; + public static final String DICTIONARY_ID_WEBSITE = "DICTIONARY_ID_WEBSITE"; + public static final String DOCACTIONBUTTON_SHOWACTIONNAME = "DOCACTIONBUTTON_SHOWACTIONNAME"; + public static final String DPVIEWS_SHOWINFOACCOUNT = "DPViews_ShowInfoAccount"; + public static final String DPVIEWS_SHOWINFOSCHEDULE = "DPViews_ShowInfoSchedule"; + public static final String Invoice_ReverseUseNewNumber = "Invoice_ReverseUseNewNumber"; + public static final String JASPER_SWAP_MAX_PAGES = "JASPER_SWAP_MAX_PAGES"; + public static final String LASTRUN_RECORD_COUNT = "LASTRUN_RECORD_COUNT"; + public static final String LOCATION_MAPS_DESTINATION_ADDRESS = "LOCATION_MAPS_DESTINATION_ADDRESS"; + public static final String LOCATION_MAPS_ROUTE_PREFIX = "LOCATION_MAPS_ROUTE_PREFIX"; + public static final String LOCATION_MAPS_SOURCE_ADDRESS = "LOCATION_MAPS_SOURCE_ADDRESS"; + public static final String LOCATION_MAPS_URL_PREFIX = "LOCATION_MAPS_URL_PREFIX"; + public static final String LOCATION_MAX_CITY_ROWS = "LOCATION_MAX_CITY_ROWS"; + public static final String LOGIN_HELP_URL = "LOGIN_HELP_URL"; + public static final String LOGIN_SHOW_RESETPASSWORD = "LOGIN_SHOW_RESETPASSWORD"; + public static final String MAIL_SEND_BCC_TO_ADDRESS = "MAIL_SEND_BCC_TO_ADDRESS"; + public static final String MAIL_SEND_BCC_TO_FROM = "MAIL_SEND_BCC_TO_FROM"; + public static final String MAIL_SEND_CREDENTIALS = "MAIL_SEND_CREDENTIALS"; + public static final String MAX_ACTIVITIES_IN_LIST = "MAX_ACTIVITIES_IN_LIST"; + public static final String MENU_INFOUPDATER_SLEEP_MS = "MENU_INFOUPDATER_SLEEP_MS"; + public static final String MFG_ValidateCostsDifferenceOnCreate = "MFG_ValidateCostsDifferenceOnCreate"; + public static final String MFG_ValidateCostsOnCreate = "MFG_ValidateCostsOnCreate"; + public static final String PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_PAYMENT = "PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_PAYMENT"; + public static final String PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_RECEIPT = "PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_RECEIPT"; + public static final String PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CREDIT_CARD = "PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CREDIT_CARD"; + public static final String PDF_FONT_DIR = "PDF_FONT_DIR"; + public static final String ProductUOMConversionRateValidate = "ProductUOMConversionRateValidate"; + public static final String ProductUOMConversionUOMValidate = "ProductUOMConversionUOMValidate"; + public static final String PROJECT_ID_COMMENTS = "PROJECT_ID_COMMENTS"; + public static final String PROJECT_ID_PASSWORD = "PROJECT_ID_PASSWORD"; + public static final String PROJECT_ID_PROJECT = "PROJECT_ID_PROJECT"; + public static final String PROJECT_ID_USE_CENTRALIZED_ID = "PROJECT_ID_USE_CENTRALIZED_ID"; + public static final String PROJECT_ID_USER = "PROJECT_ID_USER"; + public static final String PROJECT_ID_WEBSITE = "PROJECT_ID_WEBSITE"; + public static final String REAL_TIME_POS = "REAL_TIME_POS"; + public static final String RecentItems_MaxSaved = "RecentItems_MaxSaved"; + public static final String RecentItems_MaxShown = "RecentItems_MaxShown"; + public static final String REPORT_SWAP_MAX_ROWS = "REPORT_SWAP_MAX_ROWS"; + public static final String SHIPPING_DEFAULT_WEIGHT_PER_PACKAGE = "SHIPPING_DEFAULT_WEIGHT_PER_PACKAGE"; + public static final String SHIPPING_SAVE_REQUEST_RESPONSE_LOG = "SHIPPING_SAVE_REQUEST_RESPONSE_LOG"; + public static final String START_VALUE_BPLOCATION_NAME = "START_VALUE_BPLOCATION_NAME"; + public static final String SWING_LOGIN_ALLOW_REMEMBER_ME = "SWING_LOGIN_ALLOW_REMEMBER_ME"; + public static final String SWING_OVERRIDE_TEXT_AREA_BEHAVIOUR = "SWING_OVERRIDE_TEXT_AREA_BEHAVIOUR"; + public static final String SYSCONFIG_INFO_DEFAULTSELECTED = "SYSCONFIG_INFO_DEFAULTSELECTED"; + public static final String SYSCONFIG_INFO_DOUBLECLICKTOGGLESSELECTION = "SYSCONFIG_INFO_DOUBLECLICKTOGGLESSELECTION"; + public static final String SYSTEM_IN_MAINTENANCE_MODE = "SYSTEM_IN_MAINTENANCE_MODE"; + public static final String SYSTEM_INSERT_CHANGELOG = "SYSTEM_INSERT_CHANGELOG"; + public static final String SYSTEM_NATIVE_SEQUENCE = "SYSTEM_NATIVE_SEQUENCE"; + public static final String TAX_SAVE_REQUEST_RESPONSE_LOG = "TAX_SAVE_REQUEST_RESPONSE_LOG"; + public static final String TWOPACK_HANDLE_TRANSLATIONS = "2PACK_HANDLE_TRANSLATIONS"; + public static final String USE_EMAIL_FOR_LOGIN = "USE_EMAIL_FOR_LOGIN"; + public static final String USER_LOCKING_MAX_ACCOUNT_LOCK_MINUTES = "USER_LOCKING_MAX_ACCOUNT_LOCK_MINUTES"; + public static final String USER_LOCKING_MAX_INACTIVE_PERIOD_DAY = "USER_LOCKING_MAX_INACTIVE_PERIOD_DAY"; + public static final String USER_LOCKING_MAX_LOGIN_ATTEMPT = "USER_LOCKING_MAX_LOGIN_ATTEMPT"; + public static final String USER_LOCKING_MAX_PASSWORD_AGE_DAY = "USER_LOCKING_MAX_PASSWORD_AGE_DAY"; + public static final String USER_PASSWORD_HASH = "USER_PASSWORD_HASH"; + public static final String VALIDATE_MATCHING_TO_ORDERED_QTY = "VALIDATE_MATCHING_TO_ORDERED_QTY"; + public static final String WEBUI_LOGOURL = "WEBUI_LOGOURL"; + public static final String ZK_BROWSER_ICON = "ZK_BROWSER_ICON"; + public static final String ZK_BROWSER_TITLE = "ZK_BROWSER_TITLE"; + public static final String ZK_BUTTON_STYLE = "ZK_BUTTON_STYLE"; + public static final String ZK_DASHBOARD_REFRESH_INTERVAL = "ZK_DASHBOARD_REFRESH_INTERVAL"; + public static final String ZK_DESKTOP_CLASS = "ZK_DESKTOP_CLASS"; + public static final String ZK_GRID_EDIT_MODELESS = "ZK_GRID_EDIT_MODELESS"; + public static final String ZK_LOGIN_ALLOW_REMEMBER_ME = "ZK_LOGIN_ALLOW_REMEMBER_ME"; + public static final String ZK_LOGO_LARGE = "ZK_LOGO_LARGE"; + public static final String ZK_LOGO_SMALL = "ZK_LOGO_SMALL"; + public static final String ZK_MAX_UPLOAD_SIZE = "ZK_MAX_UPLOAD_SIZE"; + public static final String ZK_PAGING_SIZE = "ZK_PAGING_SIZE"; + public static final String ZK_REPORT_FORM_OUTPUT_TYPE = "ZK_REPORT_FORM_OUTPUT_TYPE"; + public static final String ZK_REPORT_JASPER_OUTPUT_TYPE = "ZK_REPORT_JASPER_OUTPUT_TYPE"; + public static final String ZK_REPORT_TABLE_OUTPUT_TYPE = "ZK_REPORT_TABLE_OUTPUT_TYPE"; + public static final String ZK_ROOT_FOLDER_BROWSER = "ZK_ROOT_FOLDER_BROWSER"; + public static final String ZK_THEME = "ZK_THEME"; /** * Standard Constructor diff --git a/org.adempiere.base/src/org/compiere/util/Login.java b/org.adempiere.base/src/org/compiere/util/Login.java index cd3d5df0f8..583b09666f 100644 --- a/org.adempiere.base/src/org/compiere/util/Login.java +++ b/org.adempiere.base/src/org/compiere/util/Login.java @@ -772,7 +772,7 @@ public class Login // IDEMPIERE-1717 Maintenance mode if (! MRole.get(m_ctx, AD_Role_ID).isAccessAdvanced()) { - if (MSysConfig.getBooleanValue("SYSTEM_IN_MAINTENANCE_MODE", false, AD_Client_ID)) + if (MSysConfig.getBooleanValue(MSysConfig.SYSTEM_IN_MAINTENANCE_MODE, false, AD_Client_ID)) return Msg.getMsg(m_ctx, "SystemInMaintenance"); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java index 01f361c1f1..ef0ed371b0 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java @@ -13,8 +13,6 @@ *****************************************************************************/ package org.adempiere.webui.dashboard; -import static org.compiere.model.MSysConfig.CALENDAR_ALTERNATE_TIMEZONE; - import java.awt.image.BufferedImage; import java.io.IOException; import java.math.BigDecimal; @@ -391,7 +389,7 @@ public class CalendarWindow extends Window implements EventListener, ITab private String getTimeZone() { - String alternateTimeZone = MSysConfig.getValue(CALENDAR_ALTERNATE_TIMEZONE, "Pacific Time=PST", Env.getAD_Client_ID(Env.getCtx())); + String alternateTimeZone = MSysConfig.getValue(MSysConfig.CALENDAR_ALTERNATE_TIMEZONE, "Pacific Time=PST", Env.getAD_Client_ID(Env.getCtx())); TimeZone defaultTimeZone = TimeZone.getDefault(); StringBuilder defaultTimeZoneName = new StringBuilder(defaultTimeZone.getDisplayName()); int defaultTimeZoneOffset = defaultTimeZone.getOffset(0) / 3600000; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ButtonFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ButtonFactory.java index 5d5e7a4976..3ed12cf91f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ButtonFactory.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ButtonFactory.java @@ -28,13 +28,11 @@ import org.compiere.util.Util; */ public class ButtonFactory { - private static final String ZK_BUTTON_STYLE = "ZK_BUTTON_STYLE"; - /** * @return true if button should have text label */ public static final boolean isWithText() { - String type = MSysConfig.getValue(ZK_BUTTON_STYLE, "I"); + String type = MSysConfig.getValue(MSysConfig.ZK_BUTTON_STYLE, "I"); return type.indexOf("T") >= 0; } @@ -42,7 +40,7 @@ public class ButtonFactory { * @return true if button should include an image icon */ public static final boolean isWithImage() { - String type = MSysConfig.getValue(ZK_BUTTON_STYLE, "I"); + String type = MSysConfig.getValue(MSysConfig.ZK_BUTTON_STYLE, "I"); return type.indexOf("I") >= 0; } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java index 0f9f0128e8..99f4f0589b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java @@ -443,7 +443,7 @@ public class LoginPanel extends Window implements EventListener private void openLoginHelp() { String langName = (String) lstLanguage.getSelectedItem().getValue(); langName = langName.substring(0, 2); - String helpURL = MSysConfig.getValue("LOGIN_HELP_URL", "http://wiki.idempiere.org/{lang}/Login_Help"); + String helpURL = MSysConfig.getValue(MSysConfig.LOGIN_HELP_URL, "http://wiki.idempiere.org/{lang}/Login_Help"); if (helpURL.contains("{lang}")) helpURL = Util.replace(helpURL, "{lang}", langName); try { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java index be89358049..5803089fa7 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java @@ -19,9 +19,6 @@ package org.adempiere.webui.theme; * */ public interface ITheme { - - //theme key in MSysConfig - public static final String ZK_THEME = "ZK_THEME"; //default theme public static final String ZK_THEME_DEFAULT = "default"; //theme resource url prefix diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java index 9a3b19dd1c..04c8835bc8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java @@ -55,8 +55,8 @@ public final class ThemeManager { * @return name of active theme */ public static String getTheme() { - String theme = System.getProperty("ZK_THEME"); - return Util.isEmpty(theme) ? MSysConfig.getValue(ITheme.ZK_THEME, ITheme.ZK_THEME_DEFAULT) : theme; + String theme = System.getProperty(MSysConfig.ZK_THEME); + return Util.isEmpty(theme) ? MSysConfig.getValue(MSysConfig.ZK_THEME, ITheme.ZK_THEME_DEFAULT) : theme; } /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java index b3d9f2ed32..95ac9db5e8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java @@ -1,7 +1,5 @@ package org.adempiere.webui.window; -import static org.compiere.model.MSysConfig.ZK_REPORT_JASPER_OUTPUT_TYPE; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -87,7 +85,7 @@ public class ZkJRViewer extends Window implements EventListener, ITabOnCl private void init() { final boolean isCanExport=MRole.getDefault().isCanExport(); - defaultType = MSysConfig.getValue(ZK_REPORT_JASPER_OUTPUT_TYPE, "PDF", + defaultType = MSysConfig.getValue(MSysConfig.ZK_REPORT_JASPER_OUTPUT_TYPE, "PDF", Env.getAD_Client_ID(Env.getCtx()), Env.getAD_Org_ID(Env.getCtx()));//It gets default Jasper output type Borderlayout layout = new Borderlayout(); diff --git a/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java b/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java index 499f8b6824..1a53af85e8 100644 --- a/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java +++ b/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java @@ -421,10 +421,10 @@ public class Allocation if (col == i_payment) { - if (! MSysConfig.getBooleanValue("ALLOW_APPLY_PAYMENT_TO_CREDITMEMO", false, Env.getAD_Client_ID(Env.getCtx())) + if (! MSysConfig.getBooleanValue(MSysConfig.ALLOW_APPLY_PAYMENT_TO_CREDITMEMO, false, Env.getAD_Client_ID(Env.getCtx())) && open.signum() > 0 && applied.signum() == -open.signum() ) applied = applied.negate(); - if (! MSysConfig.getBooleanValue("ALLOW_OVER_APPLIED_PAYMENT", false, Env.getAD_Client_ID(Env.getCtx()))) + if (! MSysConfig.getBooleanValue(MSysConfig.ALLOW_OVER_APPLIED_PAYMENT, false, Env.getAD_Client_ID(Env.getCtx()))) if ( open.abs().compareTo( applied.abs() ) < 0 ) applied = open; }