midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with f4aae2365c3dd3b96e035a358cffd47693d44d42

This commit is contained in:
Heng Sin Low 2012-08-15 08:40:43 +08:00
parent c0573def3e 9fcf487478
commit b75d09aff9
125 changed files with 429 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
migration/360lts-release/oracle/876_IDEMPIERE-364_FixWrongField.sql Normal file
View File

@ -0,0 +1,22 @@
-- Aug 14, 2012 3:36:39 PM COT
-- IDEMPIERE-364 Improve Grid Layout
UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=200273
;
-- Aug 14, 2012 3:36:39 PM COT
UPDATE AD_Field SET SeqNoGrid=320,IsDisplayedGrid='Y' WHERE AD_Field_ID=200275
;
-- Aug 14, 2012 3:36:45 PM COT
UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=200273
;
-- Aug 14, 2012 3:36:45 PM COT
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=200275
;
UPDATE AD_System
SET LastMigrationScriptApplied='876_IDEMPIERE-364_FixWrongField.sql'
WHERE LastMigrationScriptApplied<'876_IDEMPIERE-364_FixWrongField.sql'
OR LastMigrationScriptApplied IS NULL
;

22
migration/360lts-release/postgresql/876_IDEMPIERE-364_FixWrongField.sql Normal file
View File

@ -0,0 +1,22 @@
-- Aug 14, 2012 3:36:39 PM COT
-- IDEMPIERE-364 Improve Grid Layout
UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=200273
;
-- Aug 14, 2012 3:36:39 PM COT
UPDATE AD_Field SET SeqNoGrid=320,IsDisplayedGrid='Y' WHERE AD_Field_ID=200275
;
-- Aug 14, 2012 3:36:45 PM COT
UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=200273
;
-- Aug 14, 2012 3:36:45 PM COT
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=200275
;
UPDATE AD_System
SET LastMigrationScriptApplied='876_IDEMPIERE-364_FixWrongField.sql'
WHERE LastMigrationScriptApplied<'876_IDEMPIERE-364_FixWrongField.sql'
OR LastMigrationScriptApplied IS NULL
;

2
org.adempiere.base.process/src/org/compiere/process/HashPasswords.java
View File

@ -44,7 +44,7 @@ public class HashPasswords extends SvrProcess
*/
protected String doIt() throws Exception
{
boolean hash_password = MSysConfig.getBooleanValue("USER_PASSWORD_HASH", false);
boolean hash_password = MSysConfig.getBooleanValue(MSysConfig.USER_PASSWORD_HASH, false);
if (hash_password)
throw new AdempiereException("Passwords already hashed");

2
org.adempiere.base.process/src/org/compiere/process/UserPassword.java
View File

@ -84,7 +84,7 @@ public class UserPassword extends SvrProcess
MUser operator = MUser.get(getCtx(), getAD_User_ID());
log.fine("User=" + user + ", Operator=" + operator);
boolean hash_password = MSysConfig.getBooleanValue("USER_PASSWORD_HASH", false);
boolean hash_password = MSysConfig.getBooleanValue(MSysConfig.USER_PASSWORD_HASH, false);
// Do we need a password ?
if (Util.isEmpty(p_OldPassword)) // Password required

4
org.adempiere.base/src/org/adempiere/pdf/Document.java
View File

@ -41,8 +41,6 @@ public class Document {
FontFactory.registerDirectories();
}
private final static String PDF_FONT_DIR = "PDF_FONT_DIR";
private static void writePDF(Pageable pageable, OutputStream output)
{
try {
@ -58,7 +56,7 @@ public class Document {
final DefaultFontMapper mapper = new DefaultFontMapper();
//Elaine 2009/02/17 - load additional font from directory set in PDF_FONT_DIR of System Configurator
String pdfFontDir = MSysConfig.getValue(PDF_FONT_DIR, "");
String pdfFontDir = MSysConfig.getValue(MSysConfig.PDF_FONT_DIR, "");
if(pdfFontDir != null && pdfFontDir.trim().length() > 0)
{
pdfFontDir = pdfFontDir.trim();

4
org.adempiere.base/src/org/compiere/Base.java
View File

@ -23,7 +23,7 @@ import org.compiere.model.GridWindow;
import org.compiere.model.GridWindowVO;
import org.compiere.model.MConversionRate;
import org.compiere.model.MUOMConversion;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.util.Env;
import org.compiere.util.Login;
@ -33,7 +33,7 @@ import org.compiere.util.Login;
* @author Jorg Janke
* @version $Id: Base.java,v 1.5 2006/09/21 20:44:54 jjanke Exp $
*/
class Base implements SystemIDs
class Base
{
/**
* Base Test

2
org.adempiere.base/src/org/compiere/acct/Doc_Payment.java
View File

@ -109,7 +109,7 @@ public class Doc_Payment extends Doc
// create Fact Header
Fact fact = new Fact(this, as, Fact.POST_Actual);
// Cash Transfer
if ("X".equals(m_TenderType) && !MSysConfig.getBooleanValue("CASH_AS_PAYMENT", true , getAD_Client_ID()))
if ("X".equals(m_TenderType) && !MSysConfig.getBooleanValue(MSysConfig.CASH_AS_PAYMENT, true , getAD_Client_ID()))
{
ArrayList<Fact> facts = new ArrayList<Fact>();
facts.add(fact);

8
org.adempiere.base/src/org/compiere/dbPort/Convert.java
View File

@ -551,13 +551,13 @@ public abstract class Convert
private static void writeLogMigrationScript(Writer w, String statement) throws IOException
{
boolean isUseCentralizedID = "Y".equals(MSysConfig.getValue("DICTIONARY_ID_USE_CENTRALIZED_ID", "Y")); // defaults to Y
boolean isUseProjectCentralizedID = "Y".equals(MSysConfig.getValue("PROJECT_ID_USE_CENTRALIZED_ID", "N")); // defaults to N
boolean isUseCentralizedID = "Y".equals(MSysConfig.getValue(MSysConfig.DICTIONARY_ID_USE_CENTRALIZED_ID, "Y")); // defaults to Y
boolean isUseProjectCentralizedID = "Y".equals(MSysConfig.getValue(MSysConfig.PROJECT_ID_USE_CENTRALIZED_ID, "N")); // defaults to N
String prm_COMMENT;
if (!isUseCentralizedID && isUseProjectCentralizedID)
prm_COMMENT = MSysConfig.getValue("PROJECT_ID_COMMENTS");
prm_COMMENT = MSysConfig.getValue(MSysConfig.PROJECT_ID_COMMENTS);
else
prm_COMMENT = MSysConfig.getValue("DICTIONARY_ID_COMMENTS");
prm_COMMENT = MSysConfig.getValue(MSysConfig.DICTIONARY_ID_COMMENTS);
// log time and date
SimpleDateFormat format = DisplayType.getDateFormat(DisplayType.DateTime);
String dateTimeText = format.format(new Timestamp(System.currentTimeMillis()));

4
org.adempiere.base/src/org/compiere/impexp/ImpFormat.java
View File

@ -24,7 +24,7 @@ import java.util.Properties;
import java.util.logging.Level;
import org.compiere.model.I_AD_ImpFormat;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.model.X_AD_ImpFormat;
import org.compiere.model.X_I_GLJournal;
import org.compiere.util.CLogger;
@ -40,7 +40,7 @@ import org.compiere.util.Env;
* @version $Id: ImpFormat.java,v 1.3 2006/07/30 00:51:05 jjanke Exp $
*/
public final class ImpFormat implements SystemIDs
public final class ImpFormat
{
/**
* Format

3
org.adempiere.base/src/org/compiere/model/GridFieldVO.java
View File

@ -27,6 +27,7 @@ import java.util.logging.Level;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import static org.compiere.model.SystemIDs.*;
/**
@ -39,7 +40,7 @@ import org.compiere.util.Env;
* @see http://sourceforge.net/tracker/?func=detail&atid=879335&aid=1877902&group_id=176962 to FR [1877902]
* @version $Id: GridFieldVO.java,v 1.3 2006/07/30 00:58:04 jjanke Exp $
*/
public class GridFieldVO implements Serializable, SystemIDs
public class GridFieldVO implements Serializable
{
/**
*

3
org.adempiere.base/src/org/compiere/model/GridTable.java
View File

@ -55,6 +55,7 @@ import org.compiere.util.MSort;
import org.compiere.util.SecureEngine;
import org.compiere.util.Trx;
import org.compiere.util.ValueNamePair;
import static org.compiere.model.SystemIDs.*;
/**
* Grid Table Model for JDBC access including buffering.
@ -89,7 +90,7 @@ import org.compiere.util.ValueNamePair;
* https://sourceforge.net/tracker/?func=detail&aid=2910368&group_id=176962&atid=879332
*/
public class GridTable extends AbstractTableModel
implements Serializable, SystemIDs
implements Serializable
{
/**
*

2
org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java
View File

@ -158,7 +158,7 @@ public class MBPartnerLocation extends X_C_BPartner_Location
return true;
MLocation address = getLocation(true);
m_uniqueName = getName();
m_unique = MSysConfig.getIntValue("START_VALUE_BPLOCATION_NAME", 0, getAD_Client_ID(), getAD_Org_ID());
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;
if (m_uniqueName != null && m_uniqueName.equals(".")) {

6
org.adempiere.base/src/org/compiere/model/MClient.java
View File

@ -885,21 +885,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);

3
org.adempiere.base/src/org/compiere/model/MCountry.java
View File

@ -30,6 +30,7 @@ import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env;
import org.compiere.util.Language;
import static org.compiere.model.SystemIDs.*;
/**
* Location Country Model (Value Object)
@ -41,7 +42,7 @@ import org.compiere.util.Language;
* <li>BF [ 2695078 ] Country is not translated on invoice
*/
public final class MCountry extends X_C_Country
implements Comparator<Object>, Serializable, SystemIDs
implements Comparator<Object>, Serializable
{
/**
*

3
org.adempiere.base/src/org/compiere/model/MEntityType.java
View File

@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
import static org.compiere.model.SystemIDs.*;
import org.compiere.util.CLogger;
@ -38,7 +39,7 @@ import org.compiere.util.CLogger;
* <li>BF [ 2861194 ] EntityType is not using normal PO framework for getting IDs
* https://sourceforge.net/tracker/?func=detail&aid=2861194&group_id=176962&atid=879332
*/
public class MEntityType extends X_AD_EntityType implements SystemIDs
public class MEntityType extends X_AD_EntityType
{
/**
*

2
org.adempiere.base/src/org/compiere/model/MInOut.java
View File

@ -1127,7 +1127,7 @@ public class MInOut extends X_M_InOut implements DocAction
{
I_C_Order order = getC_Order();
if (order != null && MDocType.DOCSUBTYPESO_PrepayOrder.equals(order.getC_DocType().getDocSubTypeSO())
&& !MSysConfig.getBooleanValue("CHECK_CREDIT_ON_PREPAY_ORDER", true, getAD_Client_ID(), getAD_Org_ID())) {
&& !MSysConfig.getBooleanValue(MSysConfig.CHECK_CREDIT_ON_PREPAY_ORDER, true, getAD_Client_ID(), getAD_Org_ID())) {
// ignore -- don't validate Prepay Orders depending on sysconfig parameter
} else {
MBPartner bp = new MBPartner (getCtx(), getC_BPartner_ID(), get_TrxName());

27
org.adempiere.base/src/org/compiere/model/MInvoice.java
View File

@ -1422,16 +1422,23 @@ public class MInvoice extends X_C_Invoice implements DocAction
}
// Credit Status
if (isSOTrx() && !isReversal())
if (isSOTrx())
{
MBPartner bp = new MBPartner (getCtx(), getC_BPartner_ID(), null);
if (MBPartner.SOCREDITSTATUS_CreditStop.equals(bp.getSOCreditStatus()))
{
m_processMsg = "@BPartnerCreditStop@ - @TotalOpenBalance@="
+ bp.getTotalOpenBalance()
+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
return DocAction.STATUS_Invalid;
}
MDocType doc = (MDocType) getC_DocTypeTarget();
// IDEMPIERE-365 - just check credit if is going to increase the debt
if ( (doc.getDocBaseType().equals(MDocType.DOCBASETYPE_ARCreditMemo) && getGrandTotal().signum() < 0 ) ||
(doc.getDocBaseType().equals(MDocType.DOCBASETYPE_ARInvoice) && getGrandTotal().signum() > 0 )
)
{
MBPartner bp = new MBPartner (getCtx(), getC_BPartner_ID(), null);
if ( MBPartner.SOCREDITSTATUS_CreditStop.equals(bp.getSOCreditStatus()) )
{
m_processMsg = "@BPartnerCreditStop@ - @TotalOpenBalance@="
+ bp.getTotalOpenBalance()
+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
return DocAction.STATUS_Invalid;
}
}
}
// Landed Costs
@ -2215,7 +2222,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
// Deep Copy
MInvoice reversal = null;
if (MSysConfig.getBooleanValue("Invoice_ReverseUseNewNumber", true, getAD_Client_ID()))
if (MSysConfig.getBooleanValue(MSysConfig.Invoice_ReverseUseNewNumber, true, getAD_Client_ID()))
reversal = copyFrom (this, getDateInvoiced(), getDateAcct(), getC_DocType_ID(), isSOTrx(), false, get_TrxName(), true);
else
reversal = copyFrom (this, getDateInvoiced(), getDateAcct(), getC_DocType_ID(), isSOTrx(), false, get_TrxName(), true, getDocumentNo()+"^");

8
org.adempiere.base/src/org/compiere/model/MLocation.java
View File

@ -52,10 +52,10 @@ public class MLocation extends X_C_Location implements Comparator<Object>
private static final long serialVersionUID = 8332515185354248079L;
// http://jira.idempiere.com/browse/IDEMPIERE-147
public static String LOCATION_MAPS_URL_PREFIX = MSysConfig.getValue("LOCATION_MAPS_URL_PREFIX");
public static String LOCATION_MAPS_ROUTE_PREFIX = MSysConfig.getValue("LOCATION_MAPS_ROUTE_PREFIX");
public static String LOCATION_MAPS_SOURCE_ADDRESS = MSysConfig.getValue("LOCATION_MAPS_SOURCE_ADDRESS");
public static String LOCATION_MAPS_DESTINATION_ADDRESS = MSysConfig.getValue("LOCATION_MAPS_DESTINATION_ADDRESS");
public static String LOCATION_MAPS_URL_PREFIX = MSysConfig.getValue(MSysConfig.LOCATION_MAPS_URL_PREFIX);
public static String LOCATION_MAPS_ROUTE_PREFIX = MSysConfig.getValue(MSysConfig.LOCATION_MAPS_ROUTE_PREFIX);
public static String LOCATION_MAPS_SOURCE_ADDRESS = MSysConfig.getValue(MSysConfig.LOCATION_MAPS_SOURCE_ADDRESS);
public static String LOCATION_MAPS_DESTINATION_ADDRESS = MSysConfig.getValue(MSysConfig.LOCATION_MAPS_DESTINATION_ADDRESS);
/**
* Get Location from Cache

58
org.adempiere.base/src/org/compiere/model/MOrder.java
View File

@ -1325,39 +1325,43 @@ public class MOrder extends X_C_Order implements DocAction
{
if ( MDocType.DOCSUBTYPESO_POSOrder.equals(dt.getDocSubTypeSO())
&& PAYMENTRULE_Cash.equals(getPaymentRule())
&& !MSysConfig.getBooleanValue("CHECK_CREDIT_ON_CASH_POS_ORDER", true, getAD_Client_ID(), getAD_Org_ID())) {
&& !MSysConfig.getBooleanValue(MSysConfig.CHECK_CREDIT_ON_CASH_POS_ORDER, true, getAD_Client_ID(), getAD_Org_ID())) {
// ignore -- don't validate for Cash POS Orders depending on sysconfig parameter
} else if (MDocType.DOCSUBTYPESO_PrepayOrder.equals(dt.getDocSubTypeSO())
&& !MSysConfig.getBooleanValue("CHECK_CREDIT_ON_PREPAY_ORDER", true, getAD_Client_ID(), getAD_Org_ID())) {
&& !MSysConfig.getBooleanValue(MSysConfig.CHECK_CREDIT_ON_PREPAY_ORDER, true, getAD_Client_ID(), getAD_Org_ID())) {
// ignore -- don't validate Prepay Orders depending on sysconfig parameter
} else {
MBPartner bp = new MBPartner (getCtx(), getBill_BPartner_ID(), get_TrxName()); // bill bp is guaranteed on beforeSave
if (MBPartner.SOCREDITSTATUS_CreditStop.equals(bp.getSOCreditStatus()))
{
m_processMsg = "@BPartnerCreditStop@ - @TotalOpenBalance@="
+ bp.getTotalOpenBalance()
+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
return DocAction.STATUS_Invalid;
if (getGrandTotal().signum() > 0) // IDEMPIERE-365 - just check credit if is going to increase the debt
{
if (MBPartner.SOCREDITSTATUS_CreditStop.equals(bp.getSOCreditStatus()))
{
m_processMsg = "@BPartnerCreditStop@ - @TotalOpenBalance@="
+ bp.getTotalOpenBalance()
+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
return DocAction.STATUS_Invalid;
}
if (MBPartner.SOCREDITSTATUS_CreditHold.equals(bp.getSOCreditStatus()))
{
m_processMsg = "@BPartnerCreditHold@ - @TotalOpenBalance@="
+ bp.getTotalOpenBalance()
+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
return DocAction.STATUS_Invalid;
}
BigDecimal grandTotal = MConversionRate.convertBase(getCtx(),
getGrandTotal(), getC_Currency_ID(), getDateOrdered(),
getC_ConversionType_ID(), getAD_Client_ID(), getAD_Org_ID());
if (MBPartner.SOCREDITSTATUS_CreditHold.equals(bp.getSOCreditStatus(grandTotal)))
{
m_processMsg = "@BPartnerOverOCreditHold@ - @TotalOpenBalance@="
+ bp.getTotalOpenBalance() + ", @GrandTotal@=" + grandTotal
+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
return DocAction.STATUS_Invalid;
}
}
if (MBPartner.SOCREDITSTATUS_CreditHold.equals(bp.getSOCreditStatus()))
{
m_processMsg = "@BPartnerCreditHold@ - @TotalOpenBalance@="
+ bp.getTotalOpenBalance()
+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
return DocAction.STATUS_Invalid;
}
BigDecimal grandTotal = MConversionRate.convertBase(getCtx(),
getGrandTotal(), getC_Currency_ID(), getDateOrdered(),
getC_ConversionType_ID(), getAD_Client_ID(), getAD_Org_ID());
if (MBPartner.SOCREDITSTATUS_CreditHold.equals(bp.getSOCreditStatus(grandTotal)))
{
m_processMsg = "@BPartnerOverOCreditHold@ - @TotalOpenBalance@="
+ bp.getTotalOpenBalance() + ", @GrandTotal@=" + grandTotal
+ ", @SO_CreditLimit@=" + bp.getSO_CreditLimit();
return DocAction.STATUS_Invalid;
}
}
}
}
m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_PREPARE);
@ -1781,7 +1785,7 @@ public class MOrder extends X_C_Order implements DocAction
log.info(toString());
StringBuffer info = new StringBuffer();
boolean realTimePOS = MSysConfig.getBooleanValue("REAL_TIME_POS", false , getAD_Client_ID());
boolean realTimePOS = MSysConfig.getBooleanValue(MSysConfig.REAL_TIME_POS, false , getAD_Client_ID());
// Create SO Shipment - Force Shipment
MInOut shipment = null;

10
org.adempiere.base/src/org/compiere/model/MPayment.java
View File

@ -543,7 +543,7 @@ public final class MPayment extends X_C_Payment
{
// @Trifon - CashPayments
//if ( getTenderType().equals("X") ) {
if ( isCashTrx() && !MSysConfig.getBooleanValue("CASH_AS_PAYMENT", true , getAD_Client_ID())) {
if ( isCashTrx() && !MSysConfig.getBooleanValue(MSysConfig.CASH_AS_PAYMENT, true , getAD_Client_ID())) {
// Cash Book Is mandatory
if ( getC_CashBook_ID() <= 0 ) {
log.saveError("Error", Msg.parseTranslation(getCtx(), "@Mandatory@: @C_CashBook_ID@"));
@ -1070,7 +1070,7 @@ public final class MPayment extends X_C_Payment
// Credit Card
if (TENDERTYPE_CreditCard.equals(getTenderType()))
{
if (MSysConfig.getBooleanValue("PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CREDIT_CARD", true, getAD_Client_ID())) {
if (MSysConfig.getBooleanValue(MSysConfig.PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CREDIT_CARD, true, getAD_Client_ID())) {
documentNo = getCreditCardType()
+ " " + Obscure.obscure(getCreditCardNumber())
+ " " + getCreditCardExpMM()
@ -1082,7 +1082,7 @@ public final class MPayment extends X_C_Payment
&& !isReceipt()
&& getCheckNo() != null && getCheckNo().length() > 0)
{
if (MSysConfig.getBooleanValue("PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_PAYMENT", true, getAD_Client_ID())) {
if (MSysConfig.getBooleanValue(MSysConfig.PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_PAYMENT, true, getAD_Client_ID())) {
documentNo = getCheckNo();
}
}
@ -1090,7 +1090,7 @@ public final class MPayment extends X_C_Payment
else if (TENDERTYPE_Check.equals(getTenderType())
&& isReceipt())
{
if (MSysConfig.getBooleanValue("PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_RECEIPT", true, getAD_Client_ID())) {
if (MSysConfig.getBooleanValue(MSysConfig.PAYMENT_OVERWRITE_DOCUMENTNO_WITH_CHECK_ON_RECEIPT, true, getAD_Client_ID())) {
if (getRoutingNo() != null)
documentNo = getRoutingNo() + ": ";
if (getAccountNo() != null)
@ -1829,7 +1829,7 @@ public final class MPayment extends X_C_Payment
// @Trifon - CashPayments
//if ( getTenderType().equals("X") ) {
if ( isCashTrx() && !MSysConfig.getBooleanValue("CASH_AS_PAYMENT", true , getAD_Client_ID())) {
if ( isCashTrx() && !MSysConfig.getBooleanValue(MSysConfig.CASH_AS_PAYMENT, true , getAD_Client_ID())) {
// Create Cash Book entry
if ( getC_CashBook_ID() <= 0 ) {
log.saveError("Error", Msg.parseTranslation(getCtx(), "@Mandatory@: @C_CashBook_ID@"));

4
org.adempiere.base/src/org/compiere/model/MRecentItem.java
View File

@ -151,7 +151,7 @@ public class MRecentItem extends X_AD_RecentItem
* it adds a record in recent item, or touches the record if it was added before
*/
public static void addModifiedField(Properties ctx, int AD_Table_ID, int Record_ID, int AD_User_ID, int AD_Role_ID, int AD_Window_ID, int AD_Tab_ID) {
int maxri = MSysConfig.getIntValue("RecentItems_MaxSaved", 50, Env.getAD_Client_ID(ctx));
int maxri = MSysConfig.getIntValue(MSysConfig.RecentItems_MaxSaved, 50, Env.getAD_Client_ID(ctx));
if (maxri <= 0)
return;
MRecentItem ri = get(ctx, AD_Table_ID, Record_ID, AD_User_ID);
@ -182,7 +182,7 @@ public class MRecentItem extends X_AD_RecentItem
private static void deleteExtraRecentItems(Properties ctx, int AD_User_ID) {
int AD_Client_ID = Env.getAD_Client_ID(ctx);
int maxri = MSysConfig.getIntValue("RecentItems_MaxSaved", 50, AD_Client_ID);
int maxri = MSysConfig.getIntValue(MSysConfig.RecentItems_MaxSaved, 50, AD_Client_ID);
if (maxri < 0)
maxri = 0;
int cntri = DB.getSQLValue(null, "SELECT COUNT(*) FROM AD_RecentItem WHERE NVL(AD_User_ID,0)=? AND AD_Client_ID=?", AD_User_ID, AD_Client_ID);

3
org.adempiere.base/src/org/compiere/model/MRegion.java
View File

@ -32,6 +32,7 @@ import org.compiere.util.CCache;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env;
import static org.compiere.model.SystemIDs.*;
/**
* Localtion Region Model (Value Object)
@ -40,7 +41,7 @@ import org.compiere.util.Env;
* @version $Id: MRegion.java,v 1.3 2006/07/30 00:58:36 jjanke Exp $
*/
public final class MRegion extends X_C_Region
implements Comparator<Object>, Serializable, SystemIDs
implements Comparator<Object>, Serializable
{
/**
*

3
org.adempiere.base/src/org/compiere/model/MRequest.java
View File

@ -31,6 +31,7 @@ import org.compiere.util.DB;
import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.TimeUtil;
import static org.compiere.model.SystemIDs.*;
/**
* Request Model
@ -38,7 +39,7 @@ import org.compiere.util.TimeUtil;
* @author Jorg Janke
* @version $Id: MRequest.java,v 1.2 2006/07/30 00:51:03 jjanke Exp $
*/
public class MRequest extends X_R_Request implements SystemIDs
public class MRequest extends X_R_Request
{
/**
*

3
org.adempiere.base/src/org/compiere/model/MRole.java
View File

@ -42,6 +42,7 @@ import org.compiere.util.Ini;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg;
import org.compiere.util.Trace;
import static org.compiere.model.SystemIDs.*;
/**
* Role Model.
@ -54,7 +55,7 @@ import org.compiere.util.Trace;
* @contributor KittiU - FR [ 3062553 ] - Duplicated action in DocAction list for Multiple Role Users
* @version $Id: MRole.java,v 1.5 2006/08/09 16:38:47 jjanke Exp $
*/
public final class MRole extends X_AD_Role implements SystemIDs
public final class MRole extends X_AD_Role
{
/**
*

24
org.adempiere.base/src/org/compiere/model/MSequence.java
View File

@ -175,7 +175,7 @@ public class MSequence extends X_AD_Sequence
// If maintaining official dictionary try to get the ID from http official server
if (adempiereSys) {
String isUseCentralizedID = MSysConfig.getValue("DICTIONARY_ID_USE_CENTRALIZED_ID", "Y"); // defaults to Y
String isUseCentralizedID = MSysConfig.getValue(MSysConfig.DICTIONARY_ID_USE_CENTRALIZED_ID, "Y"); // defaults to Y
if ( ( ! isUseCentralizedID.equals("N") ) && ( ! isExceptionCentralized(TableName) ) ) {
// get ID from http site
retValue = getNextOfficialID_HTTP(TableName);
@ -204,7 +204,7 @@ public class MSequence extends X_AD_Sequence
// If not official dictionary try to get the ID from http custom server - if configured
if (queryProjectServer && ( ! adempiereSys ) && ( ! isExceptionCentralized(TableName) ) ) {
String isUseProjectCentralizedID = MSysConfig.getValue("PROJECT_ID_USE_CENTRALIZED_ID", "N"); // defaults to N
String isUseProjectCentralizedID = MSysConfig.getValue(MSysConfig.PROJECT_ID_USE_CENTRALIZED_ID, "N"); // defaults to N
if (isUseProjectCentralizedID.equals("Y")) {
// get ID from http site
retValue = getNextProjectID_HTTP(TableName);
@ -1037,7 +1037,7 @@ public class MSequence extends X_AD_Sequence
*/
public static boolean createTableSequence (Properties ctx, String TableName, String trxName)
{
boolean SYSTEM_NATIVE_SEQUENCE = MSysConfig.getBooleanValue("SYSTEM_NATIVE_SEQUENCE",false);
boolean SYSTEM_NATIVE_SEQUENCE = MSysConfig.getBooleanValue(MSysConfig.SYSTEM_NATIVE_SEQUENCE,false);
if(SYSTEM_NATIVE_SEQUENCE)
{
@ -1511,12 +1511,12 @@ public class MSequence extends X_AD_Sequence
*/
public static synchronized int getNextOfficialID_HTTP (String TableName)
{
String website = MSysConfig.getValue("DICTIONARY_ID_WEBSITE"); // "http://developer.adempiere.com/cgi-bin/get_ID";
String prm_USER = MSysConfig.getValue("DICTIONARY_ID_USER"); // "globalqss";
String prm_PASSWORD = MSysConfig.getValue("DICTIONARY_ID_PASSWORD"); // "password_inseguro";
String website = MSysConfig.getValue(MSysConfig.DICTIONARY_ID_WEBSITE); // "http://developer.adempiere.com/cgi-bin/get_ID";
String prm_USER = MSysConfig.getValue(MSysConfig.DICTIONARY_ID_USER); // "globalqss";
String prm_PASSWORD = MSysConfig.getValue(MSysConfig.DICTIONARY_ID_PASSWORD); // "password_inseguro";
String prm_TABLE = TableName;
String prm_ALTKEY = ""; // TODO: generate alt-key based on key of table
String prm_COMMENT = MSysConfig.getValue("DICTIONARY_ID_COMMENTS");
String prm_COMMENT = MSysConfig.getValue(MSysConfig.DICTIONARY_ID_COMMENTS);
String prm_PROJECT = new String("Adempiere");
return getNextID_HTTP(TableName, website, prm_USER,
@ -1532,13 +1532,13 @@ public class MSequence extends X_AD_Sequence
*/
public static synchronized int getNextProjectID_HTTP (String TableName)
{
String website = MSysConfig.getValue("PROJECT_ID_WEBSITE"); // "http://developer.adempiere.com/cgi-bin/get_ID";
String prm_USER = MSysConfig.getValue("PROJECT_ID_USER"); // "globalqss";
String prm_PASSWORD = MSysConfig.getValue("PROJECT_ID_PASSWORD"); // "password_inseguro";
String website = MSysConfig.getValue(MSysConfig.PROJECT_ID_WEBSITE); // "http://developer.adempiere.com/cgi-bin/get_ID";
String prm_USER = MSysConfig.getValue(MSysConfig.PROJECT_ID_USER); // "globalqss";
String prm_PASSWORD = MSysConfig.getValue(MSysConfig.PROJECT_ID_PASSWORD); // "password_inseguro";
String prm_TABLE = TableName;
String prm_ALTKEY = ""; // TODO: generate alt-key based on key of table
String prm_COMMENT = MSysConfig.getValue("PROJECT_ID_COMMENTS");
String prm_PROJECT = MSysConfig.getValue("PROJECT_ID_PROJECT");
String prm_COMMENT = MSysConfig.getValue(MSysConfig.PROJECT_ID_COMMENTS);
String prm_PROJECT = MSysConfig.getValue(MSysConfig.PROJECT_ID_PROJECT);
return getNextID_HTTP(TableName, website, prm_USER,
prm_PASSWORD, prm_TABLE, prm_ALTKEY, prm_COMMENT, prm_PROJECT);

3
org.adempiere.base/src/org/compiere/model/MSetup.java
View File

@ -34,6 +34,7 @@ import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg;
import org.compiere.util.Trx;
import static org.compiere.model.SystemIDs.*;
/**
* Initial Setup Model
@ -46,7 +47,7 @@ import org.compiere.util.Trx;
* @author Carlos Ruiz - globalqss
* <li>Setup correctly IsSOTrx for return documents
*/
public final class MSetup implements SystemIDs
public final class MSetup
{
/**
* Constructor

65
org.adempiere.base/src/org/compiere/model/MSysConfig.java
View File

@ -37,7 +37,69 @@ public class MSysConfig extends X_AD_SysConfig
/**
*
*/
private static final long serialVersionUID = -5271070197457739666L;
private static final long serialVersionUID = -9111154530183645884L;
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 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 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 REAL_TIME_POS = "REAL_TIME_POS";
/**
* Standard Constructor
@ -508,4 +570,5 @@ public class MSysConfig extends X_AD_SysConfig
+", EntityType="+getEntityType()
+"]";
}
} // MSysConfig

12
org.adempiere.base/src/org/compiere/model/MSystem.java
View File

@ -474,23 +474,23 @@ public class MSystem extends X_AD_System
private static final String SYSTEM_ALLOW_REMEMBER_PASSWORD = "P";
public static boolean isZKRememberUserAllowed() {
String ca = MSysConfig.getValue("ZK_LOGIN_ALLOW_REMEMBER_ME", SYSTEM_ALLOW_REMEMBER_USER);
String ca = MSysConfig.getValue(MSysConfig.ZK_LOGIN_ALLOW_REMEMBER_ME, SYSTEM_ALLOW_REMEMBER_USER);
return (ca.equalsIgnoreCase(SYSTEM_ALLOW_REMEMBER_USER) || ca.equalsIgnoreCase(SYSTEM_ALLOW_REMEMBER_PASSWORD));
}
public static boolean isZKRememberPasswordAllowed() {
String ca = MSysConfig.getValue("ZK_LOGIN_ALLOW_REMEMBER_ME", SYSTEM_ALLOW_REMEMBER_USER);
return (ca.equalsIgnoreCase(SYSTEM_ALLOW_REMEMBER_PASSWORD) && !MSysConfig.getBooleanValue("USER_PASSWORD_HASH", false));
String ca = MSysConfig.getValue(MSysConfig.ZK_LOGIN_ALLOW_REMEMBER_ME, SYSTEM_ALLOW_REMEMBER_USER);
return (ca.equalsIgnoreCase(SYSTEM_ALLOW_REMEMBER_PASSWORD) && !MSysConfig.getBooleanValue(MSysConfig.USER_PASSWORD_HASH, false));
}
public static boolean isSwingRememberUserAllowed() {
String ca = MSysConfig.getValue("SWING_LOGIN_ALLOW_REMEMBER_ME", SYSTEM_ALLOW_REMEMBER_PASSWORD);
String ca = MSysConfig.getValue(MSysConfig.SWING_LOGIN_ALLOW_REMEMBER_ME, SYSTEM_ALLOW_REMEMBER_PASSWORD);
return (ca.equalsIgnoreCase(SYSTEM_ALLOW_REMEMBER_USER) || ca.equalsIgnoreCase(SYSTEM_ALLOW_REMEMBER_PASSWORD));
}
public static boolean isSwingRememberPasswordAllowed() {
String ca = MSysConfig.getValue("SWING_LOGIN_ALLOW_REMEMBER_ME", SYSTEM_ALLOW_REMEMBER_PASSWORD);
return (ca.equalsIgnoreCase(SYSTEM_ALLOW_REMEMBER_PASSWORD) && !MSysConfig.getBooleanValue("USER_PASSWORD_HASH", false));
String ca = MSysConfig.getValue(MSysConfig.SWING_LOGIN_ALLOW_REMEMBER_ME, SYSTEM_ALLOW_REMEMBER_PASSWORD);
return (ca.equalsIgnoreCase(SYSTEM_ALLOW_REMEMBER_PASSWORD) && !MSysConfig.getBooleanValue(MSysConfig.USER_PASSWORD_HASH, false));
}
/**

4
org.adempiere.base/src/org/compiere/model/MUOMConversion.java
View File

@ -702,7 +702,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
return false;
}
// Enforce Product UOM
if (MSysConfig.getBooleanValue("ProductUOMConversionUOMValidate", true))
if (MSysConfig.getBooleanValue(MSysConfig.ProductUOMConversionUOMValidate, true))
{
if (getM_Product_ID() != 0
&& (newRecord || is_ValueChanged("M_Product_ID")))
@ -718,7 +718,7 @@ public class MUOMConversion extends X_C_UOM_Conversion
}
// The Product UoM needs to be the smallest UoM - Multiplier must be < 0; Divider must be > 0
if (MSysConfig.getBooleanValue("ProductUOMConversionRateValidate", true))
if (MSysConfig.getBooleanValue(MSysConfig.ProductUOMConversionRateValidate, true))
{
if (getM_Product_ID() != 0 && getDivideRate().compareTo(Env.ONE) < 0)
{

10
org.adempiere.base/src/org/compiere/model/MUser.java
View File

@ -172,7 +172,7 @@ public class MUser extends X_AD_User
s_log.warning ("Invalid Name/Password = " + name + "/" + password);
return null;
}
boolean hash_password = MSysConfig.getBooleanValue("USER_PASSWORD_HASH", false);
boolean hash_password = MSysConfig.getBooleanValue(MSysConfig.USER_PASSWORD_HASH, false);
MUser retValue = null;
if (!hash_password)
{
@ -432,7 +432,7 @@ public class MUser extends X_AD_User
super.setPassword(password);
return;
}
boolean hash_password = MSysConfig.getBooleanValue("USER_PASSWORD_HASH", false);
boolean hash_password = MSysConfig.getBooleanValue(MSysConfig.USER_PASSWORD_HASH, false);
if(!hash_password){
super.setPassword(password);
@ -922,7 +922,7 @@ public class MUser extends X_AD_User
if (newRecord || super.getValue() == null || is_ValueChanged("Value"))
setValue(super.getValue());
boolean email_login = MSysConfig.getBooleanValue("USE_EMAIL_FOR_LOGIN", false);
boolean email_login = MSysConfig.getBooleanValue(MSysConfig.USE_EMAIL_FOR_LOGIN, false);
if (email_login && getPassword() != null && getPassword().length() > 0) {
// email is mandatory for users with password
if (getEMail() == null || getEMail().length() == 0) {
@ -952,7 +952,7 @@ public class MUser extends X_AD_User
}
// Hash password - IDEMPIERE-347
boolean hash_password = MSysConfig.getBooleanValue("USER_PASSWORD_HASH", false);
boolean hash_password = MSysConfig.getBooleanValue(MSysConfig.USER_PASSWORD_HASH, false);
if (hash_password)
setPassword(getPassword());
}
@ -996,7 +996,7 @@ public class MUser extends X_AD_User
.append(" INNER JOIN AD_User_Roles ur ON (u.AD_User_ID=ur.AD_User_ID AND ur.IsActive='Y')")
.append(" INNER JOIN AD_Role r ON (ur.AD_Role_ID=r.AD_Role_ID AND r.IsActive='Y') ");
sql.append("WHERE u.Password IS NOT NULL AND ur.AD_Client_ID=? AND "); // #1/2
boolean email_login = MSysConfig.getBooleanValue("USE_EMAIL_FOR_LOGIN", false);
boolean email_login = MSysConfig.getBooleanValue(MSysConfig.USE_EMAIL_FOR_LOGIN, false);
if (email_login)
sql.append("u.EMail=?");
else

2
org.adempiere.base/src/org/compiere/model/PO.java
View File

@ -2828,7 +2828,7 @@ public abstract class PO
}
// Change Log - Only
String insertLog = MSysConfig.getValue("SYSTEM_INSERT_CHANGELOG", "Y", getAD_Client_ID());
String insertLog = MSysConfig.getValue(MSysConfig.SYSTEM_INSERT_CHANGELOG, "Y", getAD_Client_ID());
if ( session != null
&& m_IDs.length == 1
&& p_info.isAllowLogging(i) // logging allowed

4
org.adempiere.base/src/org/compiere/model/SystemIDs.java
View File

@ -16,14 +16,12 @@
*****************************************************************************/
package org.compiere.model;
import org.compiere.util.DisplayType;
/**
* List all hardcoded ID used in the code
* @author Carlos Ruiz, Nicolas Micoud, ...
*/
public interface SystemIDs
public class SystemIDs
{
public final static int COLUMN_AD_WF_ACTIVITY_AD_USER_ID = 10443;
public final static int COLUMN_C_BANKSTATEMENT_C_BANKACCOUNT_ID = 4917;

4
org.adempiere.base/src/org/compiere/print/ReportEngine.java
View File

@ -71,7 +71,7 @@ import org.compiere.model.MProject;
import org.compiere.model.MQuery;
import org.compiere.model.MRfQResponse;
import org.compiere.model.PrintInfo;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.print.layout.LayoutEngine;
import org.compiere.process.ProcessInfo;
import org.compiere.util.CLogger;
@ -108,7 +108,7 @@ import org.eevolution.model.X_PP_Order;
*
* FR 2872010 - Dunning Run for a complete Dunning (not just level) - Developer: Carlos Ruiz - globalqss - Sponsor: Metas
*/
public class ReportEngine implements PrintServiceAttributeListener, SystemIDs
public class ReportEngine implements PrintServiceAttributeListener
{
/**
* Constructor

5
org.adempiere.base/src/org/compiere/print/util/SerializableMatrixImpl.java
View File

@ -38,9 +38,6 @@ public class SerializableMatrixImpl<T extends Serializable> implements Serializa
/** Default to start swapping after 2k row **/
private static final int DEFAULT_SWAP_MAX_ROWS = 2000;
/** set to 0 or smaller to disable swap file usage **/
private static final String REPORT_SWAP_MAX_ROWS = "REPORT_SWAP_MAX_ROWS";
private static final CLogger log = CLogger.getCLogger(SerializableMatrixImpl.class);
/** Data Structure rows */
@ -63,7 +60,7 @@ public class SerializableMatrixImpl<T extends Serializable> implements Serializa
public SerializableMatrixImpl(String name) {
this.prefix = name;
int pageSize = MSysConfig.getIntValue(REPORT_SWAP_MAX_ROWS, DEFAULT_SWAP_MAX_ROWS);
int pageSize = MSysConfig.getIntValue(MSysConfig.REPORT_SWAP_MAX_ROWS, DEFAULT_SWAP_MAX_ROWS);
if (pageSize <= 0) {
m_pageSize = Integer.MAX_VALUE;
} else {

4
org.adempiere.base/src/org/compiere/report/FinReport.java
View File

@ -25,7 +25,7 @@ import java.util.logging.Level;
import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MReportCube;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.print.MPrintFormat;
import org.compiere.print.MPrintFormatItem;
import org.compiere.process.ProcessInfoParameter;
@ -46,7 +46,7 @@ import org.compiere.util.TimeUtil;
*
* @version $Id: FinReport.java,v 1.2 2006/07/30 00:51:05 jjanke Exp $
*/
public class FinReport extends SvrProcess implements SystemIDs
public class FinReport extends SvrProcess
{
/** Period Parameter */
private int p_C_Period_ID = 0;

4
org.adempiere.base/src/org/compiere/report/FinStatement.java
View File

@ -27,7 +27,7 @@ import java.util.logging.Level;
import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MElementValue;
import org.compiere.model.MPeriod;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.print.MPrintFormat;
import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess;
@ -53,7 +53,7 @@ import org.compiere.util.Msg;
* <li>FR [2857076] User Element 1 and 2 completion - https://sourceforge.net/tracker/?func=detail&aid=2857076&group_id=176962&atid=879335
*
*/
public class FinStatement extends SvrProcess implements SystemIDs
public class FinStatement extends SvrProcess
{
/** AcctSchame Parameter */
private int p_C_AcctSchema_ID = 0;

2
org.adempiere.base/src/org/compiere/util/DB.java
View File

@ -1861,7 +1861,7 @@ public final class DB
*/
public static int getNextID (int AD_Client_ID, String TableName, String trxName)
{
boolean SYSTEM_NATIVE_SEQUENCE = MSysConfig.getBooleanValue("SYSTEM_NATIVE_SEQUENCE",false);
boolean SYSTEM_NATIVE_SEQUENCE = MSysConfig.getBooleanValue(MSysConfig.SYSTEM_NATIVE_SEQUENCE,false);
boolean adempiereSys = Ini.isPropertyBool(Ini.P_ADEMPIERESYS);
if(SYSTEM_NATIVE_SEQUENCE && !adempiereSys)

4
org.adempiere.base/src/org/compiere/util/DisplayType.java
View File

@ -23,7 +23,7 @@ import java.text.SimpleDateFormat;
import java.util.Locale;
import java.util.logging.Level;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
/**
* System Display Types.
@ -36,7 +36,7 @@ import org.compiere.model.SystemIDs;
* @author Teo Sarca, SC ARHIPAC SERVICE SRL
* <li>BF [ 1810632 ] PricePrecision error in InfoProduct (and similar)
*/
public final class DisplayType implements SystemIDs
public final class DisplayType
{
/** Display Type 10 String */
public static final int String = REFERENCE_DATATYPE_STRING;

4
org.adempiere.base/src/org/compiere/util/EMail.java
View File

@ -133,7 +133,7 @@ public final class EMail implements Serializable
{
setSmtpHost(smtpHost);
setFrom(from);
String bccAddressForAllMails = MSysConfig.getValue("MAIL_SEND_BCC_TO_ADDRESS", Env.getAD_Client_ID(Env.getCtx()));
String bccAddressForAllMails = MSysConfig.getValue(MSysConfig.MAIL_SEND_BCC_TO_ADDRESS, Env.getAD_Client_ID(Env.getCtx()));
if (bccAddressForAllMails != null && bccAddressForAllMails.length() > 0)
addBcc(bccAddressForAllMails);
addTo(to);
@ -498,7 +498,7 @@ public final class EMail implements Serializable
try
{
m_from = new InternetAddress (newFrom, true);
if (MSysConfig.getBooleanValue("MAIL_SEND_BCC_TO_FROM", false, Env.getAD_Client_ID(Env.getCtx())));
if (MSysConfig.getBooleanValue(MSysConfig.MAIL_SEND_BCC_TO_FROM, false, Env.getAD_Client_ID(Env.getCtx())));
addBcc(newFrom);
}
catch (Exception e)

8
org.adempiere.base/src/org/compiere/util/Login.java
View File

@ -262,7 +262,7 @@ public class Login
// if not authenticated, use AD_User as backup
}
boolean hash_password=MSysConfig.getBooleanValue("USER_PASSWORD_HASH", false);
boolean hash_password=MSysConfig.getBooleanValue(MSysConfig.USER_PASSWORD_HASH, false);
KeyNamePair[] retValue = null;
ArrayList<KeyNamePair> list = new ArrayList<KeyNamePair>();
@ -1297,8 +1297,8 @@ public class Login
// if not authenticated, use AD_User as backup
}
boolean hash_password = MSysConfig.getBooleanValue("USER_PASSWORD_HASH", false);
boolean email_login = MSysConfig.getBooleanValue("USE_EMAIL_FOR_LOGIN", false);
boolean hash_password = MSysConfig.getBooleanValue(MSysConfig.USER_PASSWORD_HASH, false);
boolean email_login = MSysConfig.getBooleanValue(MSysConfig.USE_EMAIL_FOR_LOGIN, false);
KeyNamePair[] retValue = null;
ArrayList<KeyNamePair> clientList = new ArrayList<KeyNamePair>();
ArrayList<Integer> clientsValidated = new ArrayList<Integer>();
@ -1419,7 +1419,7 @@ public class Login
.append(" INNER JOIN AD_User_Roles ur ON (u.AD_User_ID=ur.AD_User_ID AND ur.IsActive='Y')")
.append(" INNER JOIN AD_Role r ON (ur.AD_Role_ID=r.AD_Role_ID AND r.IsActive='Y') ");
sql.append("WHERE u.Password IS NOT NULL AND ur.AD_Client_ID=? AND ");
boolean email_login = MSysConfig.getBooleanValue("USE_EMAIL_FOR_LOGIN", false);
boolean email_login = MSysConfig.getBooleanValue(MSysConfig.USE_EMAIL_FOR_LOGIN, false);
if (email_login)
sql.append("u.EMail=?");
else

2
org.adempiere.base/src/org/compiere/util/WebUser.java
View File

@ -677,7 +677,7 @@ public class WebUser
boolean retValue = false;
if(m_loggedIn)
{
boolean hash_password=MSysConfig.getBooleanValue("USER_PASSWORD_HASH", false);
boolean hash_password=MSysConfig.getBooleanValue(MSysConfig.USER_PASSWORD_HASH, false);
if(!hash_password)
{
String sql = "SELECT * FROM AD_User "

4
org.adempiere.base/src/org/compiere/wf/DocWorkflowManager.java
View File

@ -22,7 +22,7 @@ import java.util.logging.Level;
import org.compiere.model.DocWorkflowMgr;
import org.compiere.model.PO;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.process.ProcessInfo;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
@ -36,7 +36,7 @@ import org.compiere.util.Evaluator;
* @author Jorg Janke
* @version $Id: DocWorkflowManager.java,v 1.2 2006/07/30 00:51:05 jjanke Exp $
*/
public class DocWorkflowManager implements DocWorkflowMgr, SystemIDs
public class DocWorkflowManager implements DocWorkflowMgr
{
/**
* Get Document Workflow Manager

4
org.adempiere.base/src/org/compiere/wf/MWFActivity.java
View File

@ -51,7 +51,7 @@ import org.compiere.model.MUser;
import org.compiere.model.MUserRoles;
import org.compiere.model.PO;
import org.compiere.model.Query;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.model.X_AD_WF_Activity;
import org.compiere.print.ReportEngine;
import org.compiere.process.DocAction;
@ -73,7 +73,7 @@ import org.compiere.util.Util;
* @author Jorg Janke
* @version $Id: MWFActivity.java,v 1.4 2006/07/30 00:51:05 jjanke Exp $
*/
public class MWFActivity extends X_AD_WF_Activity implements Runnable, SystemIDs
public class MWFActivity extends X_AD_WF_Activity implements Runnable
{
/**
*

6
org.adempiere.base/src/org/eevolution/process/EnableNativeSequence.java
View File

@ -29,7 +29,7 @@ import org.compiere.model.MSequence;
import org.compiere.model.MSysConfig;
import org.compiere.model.MTable;
import org.compiere.model.Query;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.model.X_AD_Table;
import org.compiere.process.ProcessInfo;
import org.compiere.process.SvrProcess;
@ -43,7 +43,7 @@ import org.compiere.util.Env;
* @author Victor Perez, e-Evolution, S.C.
* @author Teo Sarca, teo.sarca@gmail.com
*/
public class EnableNativeSequence extends SvrProcess implements SystemIDs
public class EnableNativeSequence extends SvrProcess
{
/**
@ -55,7 +55,7 @@ public class EnableNativeSequence extends SvrProcess implements SystemIDs
protected String doIt()
{
boolean SYSTEM_NATIVE_SEQUENCE = MSysConfig.getBooleanValue("SYSTEM_NATIVE_SEQUENCE",false);
boolean SYSTEM_NATIVE_SEQUENCE = MSysConfig.getBooleanValue(MSysConfig.SYSTEM_NATIVE_SEQUENCE,false);
if(SYSTEM_NATIVE_SEQUENCE)
{
throw new AdempiereException("Native Sequence is Actived");

10
org.adempiere.pipo.legacy/src/org/adempiere/pipo/AbstractElementHandler.java
View File

@ -16,6 +16,13 @@
*****************************************************************************/
package org.adempiere.pipo;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_BUTTON;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_LIST;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_MEMO;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_STRING;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_TEXT;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_YES_NO;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@ -28,7 +35,6 @@ import javax.xml.transform.sax.TransformerHandler;
import org.compiere.model.PO;
import org.compiere.model.POInfo;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_AD_Package_Imp_Detail;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
@ -37,7 +43,7 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
public abstract class AbstractElementHandler implements ElementHandler, SystemIDs {
public abstract class AbstractElementHandler implements ElementHandler {
protected CLogger log = CLogger.getCLogger("PackIn");

2
org.adempiere.pipo.legacy/src/org/adempiere/pipo/PackOut.java
View File

@ -786,7 +786,7 @@ public class PackOut extends SvrProcess
*/
public void createTranslations (String parentTableName, int parentID, TransformerHandler packOutDocument) throws SAXException
{
if (MSysConfig.getBooleanValue("2PACK_HANDLE_TRANSLATIONS", false)) {
if (MSysConfig.getBooleanValue(MSysConfig.TWOPACK_HANDLE_TRANSLATIONS, false)) {
Env.setContext(getCtx(), CommonTranslationHandler.CONTEXT_KEY__PARENT_TABLE,
parentTableName);

26
org.adempiere.pipo.legacy/src/org/adempiere/pipo/PackRoll.java
View File

@ -16,6 +16,26 @@
*****************************************************************************/
package org.adempiere.pipo;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_ACCOUNT;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_AMOUNT;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_BUTTON;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_COLOR;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_DATE;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_DATETIME;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_INTEGER;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_LIST;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_LOCATION;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_LOCATOR;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_MEMO;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_NUMBER;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_PRODUCTATTRIBUTE;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_QUANTITY;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_SEARCH;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_TABLE;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_TABLEDIR;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_TEXT;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_YES_NO;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@ -37,7 +57,7 @@ import org.compiere.util.Env;
* @author Robert Klein
*
*/
public class PackRoll extends SvrProcess implements SystemIDs {
public class PackRoll extends SvrProcess {
/** Package from Record */
private int m_AD_Package_Imp_ID = 0;
private String m_Processing = null;
@ -266,7 +286,7 @@ public class PackRoll extends SvrProcess implements SystemIDs {
// treatment for EntityType
// it's a Table reference but must
// be treated as String
|| (v_AD_Reference_ID == REFERENCE_DATATYPE_TABLE && columnName
|| (v_AD_Reference_ID == SystemIDs.REFERENCE_DATATYPE_TABLE && columnName
.equalsIgnoreCase("EntityType")))
if (rs2.getObject("ColValue")
.toString().equals("null")) {
@ -302,7 +322,7 @@ public class PackRoll extends SvrProcess implements SystemIDs {
}
// Update columns that are Strings adjusting
// for single quotes
else if (v_AD_Reference_ID == REFERENCE_DATATYPE_ID
else if (v_AD_Reference_ID == SystemIDs.REFERENCE_DATATYPE_ID
|| v_AD_Reference_ID == REFERENCE_DATATYPE_TABLE
|| v_AD_Reference_ID == REFERENCE_DATATYPE_TABLEDIR
|| v_AD_Reference_ID == REFERENCE_DATATYPE_LOCATION

2
org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/CommonTranslationHandler.java
View File

@ -33,7 +33,7 @@ public class CommonTranslationHandler extends AbstractElementHandler implements
public void startElement(Properties ctx, Element element) throws SAXException {
if(! MSysConfig.getBooleanValue("2PACK_HANDLE_TRANSLATIONS", false)){
if(! MSysConfig.getBooleanValue(MSysConfig.TWOPACK_HANDLE_TRANSLATIONS, false)){
return;//translation import option is disabled
}

6
org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/MenuElementHandler.java
View File

@ -16,6 +16,9 @@
*****************************************************************************/
package org.adempiere.pipo.handler;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_BUTTON;
import static org.compiere.model.SystemIDs.REFERENCE_DATATYPE_YES_NO;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
@ -27,7 +30,6 @@ import javax.xml.transform.sax.TransformerHandler;
import org.adempiere.pipo.AbstractElementHandler;
import org.adempiere.pipo.Element;
import org.adempiere.pipo.PackOut;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_AD_Menu;
import org.compiere.util.DB;
import org.compiere.util.Env;
@ -35,7 +37,7 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
public class MenuElementHandler extends AbstractElementHandler implements SystemIDs {
public class MenuElementHandler extends AbstractElementHandler {
public void startElement(Properties ctx, Element element)
throws SAXException {

3
org.adempiere.report.jasper/src/org/compiere/report/ReportStarter.java
View File

@ -106,7 +106,6 @@ import org.compiere.utils.DigestOfFile;
public class ReportStarter implements ProcessCall, ClientProcess
{
private static final int DEFAULT_SWAP_MAX_PAGES = 100;
private static final String JASPER_SWAP_MAX_PAGES = "JASPER_REPORT_SWAP_MAX_PAGES";
/** Logger */
private static CLogger log = CLogger.getCLogger(ReportStarter.class);
private static File REPORT_HOME = null;
@ -519,7 +518,7 @@ public class ReportStarter implements ProcessCall, ClientProcess
Connection conn = null;
JRSwapFileVirtualizer virtualizer = null;
int maxPages = MSysConfig.getIntValue(JASPER_SWAP_MAX_PAGES, DEFAULT_SWAP_MAX_PAGES);
int maxPages = MSysConfig.getIntValue(MSysConfig.JASPER_SWAP_MAX_PAGES, DEFAULT_SWAP_MAX_PAGES);
try {
conn = getConnection();

2
org.adempiere.server/src/main/server/org/compiere/server/AlertProcessor.java
View File

@ -165,7 +165,7 @@ public class AlertProcessor extends AdempiereServer
try
{
String text = null;
if (MSysConfig.getBooleanValue("ALERT_SEND_ATTACHMENT_AS_XLS", true, Env.getAD_Client_ID(getCtx())))
if (MSysConfig.getBooleanValue(MSysConfig.ALERT_SEND_ATTACHMENT_AS_XLS, true, Env.getAD_Client_ID(getCtx())))
text = getExcelReport(rule, sql, trxName, attachments);
else
text = getPlainTextReport(rule, sql, trxName, attachments);

4
org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java
View File

@ -29,7 +29,7 @@ import java.util.logging.Level;
import javax.swing.JComboBox;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.model.MAcctSchema;
import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MFactAcct;
@ -57,7 +57,7 @@ import org.compiere.util.ValueNamePair;
* <li>BF [ 1748449 ] Info Account - Posting Type is not translated
* <li>BF [ 1778373 ] AcctViewer: data is not sorted proper
*/
class AcctViewerData implements SystemIDs
class AcctViewerData
{
/**
* Constructor

4
org.adempiere.ui.swing/src/org/compiere/apps/AArchive.java
View File

@ -29,7 +29,7 @@ import javax.swing.JPopupMenu;
import org.compiere.apps.form.ArchiveViewer;
import org.compiere.apps.form.FormFrame;
import org.compiere.model.MBPartner;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CMenuItem;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
@ -44,7 +44,7 @@ import org.compiere.util.Msg;
* @author Jorg Janke
* @version $Id: AArchive.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
*/
public class AArchive implements ActionListener, SystemIDs
public class AArchive implements ActionListener
{
/**
* Constructor

4
org.adempiere.ui.swing/src/org/compiere/apps/AEnv.java
View File

@ -51,7 +51,7 @@ import org.compiere.interfaces.Server;
import org.compiere.model.MMenu;
import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.process.DocumentEngine;
import org.compiere.swing.CButton;
import org.compiere.swing.CFrame;
@ -75,7 +75,7 @@ import org.compiere.util.Splash;
* @see FR [ 1966328 ] New Window Info to MRP and CRP into View http://sourceforge.net/tracker/index.php?func=detail&aid=1966328&group_id=176962&atid=879335
*
*/
public final class AEnv implements SystemIDs
public final class AEnv
{
// Array of active Windows
private static ArrayList<Container> s_windows = new ArrayList<Container>(20);

2
org.adempiere.ui.swing/src/org/compiere/apps/ALogin.java
View File

@ -697,7 +697,7 @@ public final class ALogin extends CDialog
roleCombo.setSelectedItem(iniValue);
// If we have only one role, we can hide the combobox - metas-2009_0021_AP1_G94
if (roleCombo.getItemCount() == 1 && ! MSysConfig.getBooleanValue("ALogin_ShowOneRole", true))
if (roleCombo.getItemCount() == 1 && ! MSysConfig.getBooleanValue(MSysConfig.ALogin_ShowOneRole, true))
{
roleCombo.setSelectedIndex(0);
roleLabel.setVisible(false);

6
org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
View File

@ -64,7 +64,7 @@ import org.compiere.model.MSysConfig;
import org.compiere.model.MSystem;
import org.compiere.model.MTreeNode;
import org.compiere.model.MUser;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CButton;
import org.compiere.swing.CFrame;
import org.compiere.swing.CPanel;
@ -93,7 +93,7 @@ import org.compiere.util.Splash;
*
*/
public final class AMenu extends CFrame
implements ActionListener, PropertyChangeListener, ChangeListener, IEnvEventListener, SystemIDs
implements ActionListener, PropertyChangeListener, ChangeListener, IEnvEventListener
{
/**
* generated serialVersionUID
@ -817,7 +817,7 @@ public final class AMenu extends CFrame
public void run()
{
int sleep = MSysConfig.getIntValue("MENU_INFOUPDATER_SLEEP_MS", 60000, Env.getAD_Client_ID(Env.getCtx()));
int sleep = MSysConfig.getIntValue(MSysConfig.MENU_INFOUPDATER_SLEEP_MS, 60000, Env.getAD_Client_ID(Env.getCtx()));
while(stop == false)
{
updateInfo();

4
org.adempiere.ui.swing/src/org/compiere/apps/APanel.java
View File

@ -92,7 +92,7 @@ import org.compiere.model.MRole;
import org.compiere.model.MToolBarButtonRestrict;
import org.compiere.model.MUser;
import org.compiere.model.MWindow;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.model.X_AD_ToolBarButton;
import org.compiere.plaf.CompiereColor;
import org.compiere.print.AReport;
@ -146,7 +146,7 @@ import org.compiere.util.Util;
* @sponsor www.metas.de
*/
public final class APanel extends CPanel
implements DataStatusListener, ChangeListener, ActionListener, IProcessUI, SystemIDs
implements DataStatusListener, ChangeListener, ActionListener, IProcessUI
{
/**
*

4
org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java
View File

@ -41,7 +41,7 @@ import org.compiere.model.MQuery;
import org.compiere.model.MRMA;
import org.compiere.model.MRequest;
import org.compiere.model.MUser;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CMenuItem;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
@ -59,7 +59,7 @@ import org.compiere.util.Msg;
* @author Teo Sarca, SC ARHIPAC SERVICE SRL
* <li>BF [ 1904928 ] Request: Related Request field not filled
*/
public class ARequest implements ActionListener, SystemIDs
public class ARequest implements ActionListener
{
/**
* Constructor

4
org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java
View File

@ -39,7 +39,7 @@ import org.adempiere.exceptions.AdempiereException;
import org.adempiere.exceptions.DBException;
import org.adempiere.util.Callback;
import org.adempiere.util.IProcessUI;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.print.ReportCtl;
import org.compiere.print.ReportEngine;
import org.compiere.process.ProcessInfo;
@ -70,7 +70,7 @@ import org.compiere.util.Msg;
* <li>BF [ 1963128 ] Running a process w/o trl should display an error
*/
public class ProcessDialog extends CFrame
implements ActionListener, IProcessUI, SystemIDs
implements ActionListener, IProcessUI
{
/**
*

4
org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java
View File

@ -45,7 +45,7 @@ import org.compiere.grid.ed.VLookup;
import org.compiere.minigrid.MiniTable;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.plaf.CompiereColor;
import org.compiere.swing.CPanel;
import org.compiere.swing.CTextField;
@ -56,7 +56,7 @@ import org.compiere.util.Trx;
import org.compiere.util.TrxRunnable;
public class VAllocation extends Allocation
implements FormPanel, ActionListener, TableModelListener, VetoableChangeListener, SystemIDs
implements FormPanel, ActionListener, TableModelListener, VetoableChangeListener
{
private CPanel panel = new CPanel();

4
org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java
View File

@ -42,7 +42,7 @@ import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MPaySelectionCheck;
import org.compiere.model.MPaymentBatch;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.plaf.CompiereColor;
import org.compiere.print.ReportCtl;
import org.compiere.print.ReportEngine;
@ -66,7 +66,7 @@ import org.compiere.util.ValueNamePair;
* Contributors:
* Carlos Ruiz - GlobalQSS - FR 3132033 - Make payment export class configurable per bank
*/
public class VPayPrint extends PayPrint implements FormPanel, ActionListener, VetoableChangeListener, SystemIDs
public class VPayPrint extends PayPrint implements FormPanel, ActionListener, VetoableChangeListener
{
private CPanel panel = new CPanel();

4
org.adempiere.ui.swing/src/org/compiere/apps/form/VPaySelect.java
View File

@ -48,7 +48,7 @@ import org.compiere.grid.ed.VCheckBox;
import org.compiere.grid.ed.VComboBox;
import org.compiere.grid.ed.VDate;
import org.compiere.minigrid.MiniTable;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.model.X_C_PaySelection;
import org.compiere.plaf.CompiereColor;
import org.compiere.process.ProcessInfo;
@ -68,7 +68,7 @@ import org.compiere.util.ValueNamePair;
* @author Jorg Janke
* @version $Id: VPaySelect.java,v 1.2 2008/07/11 08:20:12 cruiz Exp $
*/
public class VPaySelect extends PaySelect implements FormPanel, ActionListener, TableModelListener, IProcessUI, SystemIDs
public class VPaySelect extends PaySelect implements FormPanel, ActionListener, TableModelListener, IProcessUI
{
/** @todo withholding */
private CPanel panel = new CPanel();

4
org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java
View File

@ -82,7 +82,7 @@ import org.compiere.model.MProduct;
import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.MUserQuery;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.model.X_AD_Column;
import org.compiere.swing.CButton;
import org.compiere.swing.CComboBox;
@ -113,7 +113,7 @@ import org.compiere.util.ValueNamePair;
* <li>BF [ 2564070 ] Saving user queries can produce unnecessary db errors
*/
public final class Find extends CDialog
implements ActionListener, ChangeListener, DataStatusListener, SystemIDs
implements ActionListener, ChangeListener, DataStatusListener
{
/**
*

8
org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java
View File

@ -102,9 +102,7 @@ public abstract class Info extends CDialog
*/
private static final long serialVersionUID = -5606614040914295869L;
public static final String SYSCONFIG_INFO_DEFAULTSELECTED = "INFO_DEFAULTSELECTED";
public static final String SYSCONFIG_INFO_DOUBLECLICKTOGGLESSELECTION = "INFO_DOUBLECLICKTOGGLESSELECTION";
/**
* Factory Constructor
@ -329,9 +327,9 @@ public abstract class Info extends CDialog
/** Enable more than one selection */
protected boolean p_multiSelection;
/** Specify if the records should be checked(selected) by default (multi selection mode only) */
private boolean p_isDefaultSelected = MSysConfig.getBooleanValue(SYSCONFIG_INFO_DEFAULTSELECTED, false, Env.getAD_Client_ID(Env.getCtx()));
private boolean p_isDefaultSelected = MSysConfig.getBooleanValue(MSysConfig.SYSCONFIG_INFO_DEFAULTSELECTED, false, Env.getAD_Client_ID(Env.getCtx()));
/** True if double click on a row toggles if row is selected (multi selection mode only) */
private boolean p_doubleClickTogglesSelection = MSysConfig.getBooleanValue(SYSCONFIG_INFO_DOUBLECLICKTOGGLESSELECTION, false, Env.getAD_Client_ID(Env.getCtx()));
private boolean p_doubleClickTogglesSelection = MSysConfig.getBooleanValue(MSysConfig.SYSCONFIG_INFO_DOUBLECLICKTOGGLESSELECTION, false, Env.getAD_Client_ID(Env.getCtx()));
/** Initial WHERE Clause */
protected String p_whereClause = "";

4
org.adempiere.ui.swing/src/org/compiere/apps/search/InfoAssignment.java
View File

@ -31,7 +31,7 @@ import org.compiere.grid.ed.VLookup;
import org.compiere.minigrid.IDColumn;
import org.compiere.model.Lookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CButton;
import org.compiere.swing.CLabel;
import org.compiere.util.DB;
@ -46,7 +46,7 @@ import org.compiere.util.Msg;
* @author Jorg Janke
* @version $Id: InfoAssignment.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
*/
public class InfoAssignment extends Info implements SystemIDs
public class InfoAssignment extends Info
{
/**
*

2
org.adempiere.ui.swing/src/org/compiere/apps/wf/WFActivity.java
View File

@ -94,7 +94,7 @@ public class WFActivity extends CPanel
*/
private static final long serialVersionUID = 3900449055030897013L;
private static final int MAX_ACTIVITIES_IN_LIST = MSysConfig.getIntValue("MAX_ACTIVITIES_IN_LIST", 200, Env.getAD_Client_ID(Env.getCtx()));
private static final int MAX_ACTIVITIES_IN_LIST = MSysConfig.getIntValue(MSysConfig.MAX_ACTIVITIES_IN_LIST, 200, Env.getAD_Client_ID(Env.getCtx()));
/**
* WF Activity

4
org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
View File

@ -35,7 +35,7 @@ import org.compiere.model.GridTab;
import org.compiere.model.MDocType;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CPanel;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
@ -43,7 +43,7 @@ import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg;
public class VCreateFromInvoiceUI extends CreateFromInvoice implements ActionListener, VetoableChangeListener, SystemIDs
public class VCreateFromInvoiceUI extends CreateFromInvoice implements ActionListener, VetoableChangeListener
{
private static final long serialVersionUID = 1L;

4
org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
View File

@ -30,14 +30,14 @@ import org.compiere.grid.ed.VLookup;
import org.compiere.model.GridTab;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CPanel;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.compiere.util.Msg;
public class VCreateFromRMAUI extends CreateFromRMA implements VetoableChangeListener, SystemIDs
public class VCreateFromRMAUI extends CreateFromRMA implements VetoableChangeListener
{
private static final long serialVersionUID = 1L;

4
org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java
View File

@ -52,7 +52,7 @@ import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MProduct;
import org.compiere.model.Query;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CPanel;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
@ -60,7 +60,7 @@ import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg;
public class VCreateFromShipmentUI extends CreateFromShipment implements ActionListener, VetoableChangeListener, SystemIDs
public class VCreateFromShipmentUI extends CreateFromShipment implements ActionListener, VetoableChangeListener
{
private VCreateFromDialog dialog;

4
org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
View File

@ -43,7 +43,7 @@ import org.compiere.model.MColumn;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MPayment;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CButton;
import org.compiere.swing.CLabel;
import org.compiere.swing.CPanel;
@ -53,7 +53,7 @@ import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.compiere.util.Msg;
public class VCreateFromStatementUI extends CreateFromStatement implements ActionListener, SystemIDs
public class VCreateFromStatementUI extends CreateFromStatement implements ActionListener
{
private static final long serialVersionUID = 1L;

2
org.adempiere.ui.swing/src/org/compiere/grid/VPayment.java
View File

@ -512,7 +512,7 @@ public class VPayment extends CDialog
* Get Data from Grid
*/
m_AD_Client_ID = ((Integer)m_mTab.getValue("AD_Client_ID")).intValue();
m_Cash_As_Payment = MSysConfig.getBooleanValue("CASH_AS_PAYMENT",true, m_AD_Client_ID);
m_Cash_As_Payment = MSysConfig.getBooleanValue(MSysConfig.CASH_AS_PAYMENT,true, m_AD_Client_ID);
m_AD_Org_ID = ((Integer)m_mTab.getValue("AD_Org_ID")).intValue();
m_C_BPartner_ID = ((Integer)m_mTab.getValue("C_BPartner_ID")).intValue();
m_PaymentRule = (String)m_mTab.getValue("PaymentRule");

2
org.adempiere.ui.swing/src/org/compiere/grid/ed/CityAutoCompleter.java
View File

@ -35,7 +35,7 @@ import org.compiere.util.Env;
public class CityAutoCompleter extends AutoCompleter
{
public static final CityVO ITEM_More = new CityVO(-1, "...", -1, "");
private final int m_maxRows = MSysConfig.getIntValue("LOCATION_MAX_CITY_ROWS", 7);
private final int m_maxRows = MSysConfig.getIntValue(MSysConfig.LOCATION_MAX_CITY_ROWS, 7);
private CityVO m_city = null;
private final int m_windowNo;
private ArrayList<CityVO> list = new ArrayList<CityVO>();

4
org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java
View File

@ -61,7 +61,7 @@ import org.compiere.model.MAccountLookup;
import org.compiere.model.MAcctSchema;
import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MQuery;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CButton;
import org.compiere.swing.CDialog;
import org.compiere.swing.CPanel;
@ -77,7 +77,7 @@ import org.compiere.util.Msg;
* @version $Id: VAccountDialog.java,v 1.3 2006/07/30 00:51:28 jjanke Exp $
*/
public final class VAccountDialog extends CDialog
implements ActionListener, DataStatusListener, VetoableChangeListener, SystemIDs
implements ActionListener, DataStatusListener, VetoableChangeListener
{
/**
*

4
org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java
View File

@ -50,7 +50,7 @@ import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.MTable;
import org.compiere.model.MWarehouse;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CButton;
import org.compiere.swing.CMenuItem;
import org.compiere.util.CLogger;
@ -65,7 +65,7 @@ import org.compiere.util.Msg;
* @version $Id: VLocator.java,v 1.5 2006/07/30 00:51:27 jjanke Exp $
*/
public class VLocator extends JComponent
implements VEditor, ActionListener, SystemIDs
implements VEditor, ActionListener
{
/**
*

4
org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java
View File

@ -58,7 +58,7 @@ import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CButton;
import org.compiere.swing.CMenuItem;
import org.compiere.swing.CTextField;
@ -96,7 +96,7 @@ import org.compiere.util.ValueNamePair;
* @sponsor www.metas.de
*/
public class VLookup extends JComponent
implements VEditor, ActionListener, FocusListener, SystemIDs
implements VEditor, ActionListener, FocusListener
{
/**
*

4
org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java
View File

@ -43,7 +43,7 @@ import org.compiere.model.GridTab;
import org.compiere.model.MAttributeSet;
import org.compiere.model.MPAttributeLookup;
import org.compiere.model.MProduct;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CButton;
import org.compiere.swing.CMenuItem;
import org.compiere.util.CLogger;
@ -62,7 +62,7 @@ import org.compiere.util.Msg;
* <li>BF [ 2011222 ] ASI Dialog is reseting locator
*/
public class VPAttribute extends JComponent
implements VEditor, ActionListener, SystemIDs
implements VEditor, ActionListener
{
/**
*

4
org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttributeDialog.java
View File

@ -54,7 +54,7 @@ import org.compiere.model.MLotCtl;
import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.MSerNoCtl;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.model.X_M_MovementLine;
import org.compiere.swing.CButton;
import org.compiere.swing.CCheckBox;
@ -80,7 +80,7 @@ import org.compiere.util.Msg;
* @version $Id: VPAttributeDialog.java,v 1.4 2006/07/30 00:51:27 jjanke Exp $
*/
public class VPAttributeDialog extends CDialog
implements ActionListener, SystemIDs
implements ActionListener
{
/**
*

4
org.adempiere.ui.swing/src/org/compiere/pos/PosPayment.java
View File

@ -53,7 +53,7 @@ import org.compiere.model.MPOS;
import org.compiere.model.MPOSKey;
import org.compiere.model.MPayment;
import org.compiere.model.MPaymentValidate;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.swing.CButton;
import org.compiere.swing.CComboBox;
import org.compiere.swing.CDialog;
@ -65,7 +65,7 @@ import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.ValueNamePair;
public class PosPayment extends CDialog implements PosKeyListener, VetoableChangeListener, ActionListener, SystemIDs {
public class PosPayment extends CDialog implements PosKeyListener, VetoableChangeListener, ActionListener {
/**
*
*/

4
org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
View File

@ -80,7 +80,7 @@ import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.MUser;
import org.compiere.model.PrintInfo;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.model.X_C_Invoice;
import org.compiere.swing.CButton;
import org.compiere.swing.CCheckBox;
@ -125,7 +125,7 @@ import org.compiere.util.ValueNamePair;
*
*/
public class Viewer extends CFrame
implements ActionListener, ChangeListener, WindowStateListener, IReportEngineEventListener, SystemIDs
implements ActionListener, ChangeListener, WindowStateListener, IReportEngineEventListener
{
/**
*

2
org.adempiere.ui.swing/src/org/compiere/swing/CTextArea.java
View File

@ -160,7 +160,7 @@ public class CTextArea extends JScrollPane
m_textArea.firePropertyChange("editable", !isEditable(), isEditable());
// IDEMPIERE-320
boolean taBehaviour = MSysConfig.getBooleanValue("SWING_OVERRIDE_TEXT_AREA_BEHAVIOUR", false, Env.getAD_Client_ID(Env.getCtx()));
boolean taBehaviour = MSysConfig.getBooleanValue(MSysConfig.SWING_OVERRIDE_TEXT_AREA_BEHAVIOUR, false, Env.getAD_Client_ID(Env.getCtx()));
if (taBehaviour)
{
InputMap im = m_textArea.getInputMap();

4
org.adempiere.ui.swing/src/org/eevolution/form/VInOutInvoiceGen.java
View File

@ -60,7 +60,7 @@ import org.compiere.model.MPInstance;
import org.compiere.model.MPInstancePara;
import org.compiere.model.MPrivateAccess;
import org.compiere.model.MRMA;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.plaf.CompiereColor;
import org.compiere.print.ReportCtl;
import org.compiere.print.ReportEngine;
@ -86,7 +86,7 @@ import org.compiere.util.Trx;
*/
public class VInOutInvoiceGen extends CPanel
implements FormPanel, ActionListener, VetoableChangeListener,
ChangeListener, TableModelListener, IProcessUI, SystemIDs
ChangeListener, TableModelListener, IProcessUI
{
/**
*

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
View File

@ -307,7 +307,7 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
private void createDesktop()
{
appDesktop = null;
String className = MSysConfig.getValue(IDesktop.CLASS_NAME_KEY);
String className = MSysConfig.getValue(MSysConfig.ZK_DESKTOP_CLASS);
if ( className != null && className.trim().length() > 0)
{
try

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WArchive.java
View File

@ -9,7 +9,7 @@ import org.adempiere.webui.component.Window;
import org.adempiere.webui.panel.ADForm;
import org.adempiere.webui.session.SessionManager;
import org.compiere.model.MBPartner;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env;
@ -28,7 +28,7 @@ import org.zkoss.zul.Menupopup;
* @author Jorg Janke
* @version $Id: AArchive.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
*/
public class WArchive implements EventListener, SystemIDs
public class WArchive implements EventListener
{
/**
* Constructor

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java
View File

@ -35,7 +35,7 @@ import org.compiere.model.MQuery;
import org.compiere.model.MRMA;
import org.compiere.model.MRequest;
import org.compiere.model.MUser;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env;
@ -57,7 +57,7 @@ import org.zkoss.zul.Menupopup;
* @author Teo Sarca, SC ARHIPAC SERVICE SRL
* <li>BF [ 1904928 ] Request: Related Request field not filled
*/
public class WRequest implements EventListener, SystemIDs
public class WRequest implements EventListener
{
/**
* Constructor

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java
View File

@ -38,7 +38,7 @@ import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MFactAcct;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MRefList;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.report.core.RColumn;
import org.compiere.report.core.RModel;
import org.compiere.util.CLogger;
@ -58,7 +58,7 @@ import org.compiere.util.ValueNamePair;
* July 27, 2007
*/
public class WAcctViewerData implements SystemIDs
public class WAcctViewerData
{
/** Window */
public int WindowNo;

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
View File

@ -27,7 +27,7 @@ import org.adempiere.webui.window.FDialog;
import org.adempiere.webui.window.MultiFileDownloadDialog;
import org.adempiere.webui.window.SimplePDFViewer;
import org.compiere.Adempiere;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.print.ReportEngine;
import org.compiere.process.ProcessInfo;
import org.compiere.process.ProcessInfoUtil;
@ -84,7 +84,7 @@ import com.lowagie.text.pdf.PdfWriter;
* @author arboleda - globalqss
* - Implement ShowHelp option on processes and reports
*/
public class ProcessDialog extends Window implements EventListener<Event>, IProcessUI, SystemIDs
public class ProcessDialog extends Window implements EventListener<Event>, IProcessUI
{
/**
* generate serial version ID

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
View File

@ -47,7 +47,7 @@ import org.adempiere.webui.window.FDialog;
import org.compiere.apps.form.Allocation;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.compiere.util.Msg;
@ -70,7 +70,7 @@ import org.zkoss.zul.Space;
* Contributor : Fabian Aguilar - OFBConsulting - Multiallocation
*/
public class WAllocation extends Allocation
implements IFormController, EventListener, WTableModelListener, ValueChangeListener, SystemIDs
implements IFormController, EventListener, WTableModelListener, ValueChangeListener
{
/**

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java
View File

@ -37,7 +37,7 @@ import org.compiere.model.GridTab;
import org.compiere.model.MDocType;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
@ -49,7 +49,7 @@ import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
import org.zkoss.zul.Space;
public class WCreateFromInvoiceUI extends CreateFromInvoice implements EventListener<Event>, ValueChangeListener, SystemIDs
public class WCreateFromInvoiceUI extends CreateFromInvoice implements EventListener<Event>, ValueChangeListener
{
private WCreateFromWindow window;

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java
View File

@ -32,7 +32,7 @@ import org.compiere.grid.CreateFromRMA;
import org.compiere.model.GridTab;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
@ -40,7 +40,7 @@ import org.compiere.util.Msg;
import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
public class WCreateFromRMAUI extends CreateFromRMA implements ValueChangeListener, SystemIDs
public class WCreateFromRMAUI extends CreateFromRMA implements ValueChangeListener
{
private WCreateFromWindow window;

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
View File

@ -43,7 +43,7 @@ import org.compiere.model.MLocatorLookup;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MProduct;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
@ -56,7 +56,7 @@ import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
import org.zkoss.zul.Space;
public class WCreateFromShipmentUI extends CreateFromShipment implements EventListener<Event>, ValueChangeListener, SystemIDs
public class WCreateFromShipmentUI extends CreateFromShipment implements EventListener<Event>, ValueChangeListener
{
private WCreateFromWindow window;

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
View File

@ -44,7 +44,7 @@ import org.compiere.model.MColumn;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MPayment;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
@ -56,7 +56,7 @@ import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
import org.zkoss.zul.Hbox;
public class WCreateFromStatementUI extends CreateFromStatement implements EventListener<Event>, SystemIDs
public class WCreateFromStatementUI extends CreateFromStatement implements EventListener<Event>
{
private WCreateFromWindow window;

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
View File

@ -50,7 +50,7 @@ import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MPaySelectionCheck;
import org.compiere.model.MPaymentBatch;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.print.ReportEngine;
import org.compiere.util.DB;
import org.compiere.util.DisplayType;
@ -75,7 +75,7 @@ import org.zkoss.zul.Filedownload;
* Contributors:
* Carlos Ruiz - GlobalQSS - FR 3132033 - Make payment export class configurable per bank
*/
public class WPayPrint extends PayPrint implements IFormController, EventListener, ValueChangeListener, SystemIDs
public class WPayPrint extends PayPrint implements IFormController, EventListener, ValueChangeListener
{
private CustomForm form = new CustomForm();

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java
View File

@ -47,7 +47,7 @@ import org.adempiere.webui.panel.IFormController;
import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.window.FDialog;
import org.compiere.apps.form.PaySelect;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.model.X_C_PaySelection;
import org.compiere.process.ProcessInfo;
import org.compiere.util.Env;
@ -76,7 +76,7 @@ import org.zkoss.zul.Space;
* @version $Id: VPaySelect.java,v 1.3 2006/07/30 00:51:28 jjanke Exp $
*/
public class WPaySelect extends PaySelect
implements IFormController, EventListener<Event>, WTableModelListener, IProcessUI, SystemIDs
implements IFormController, EventListener<Event>, WTableModelListener, IProcessUI
{
/** @todo withholding */

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java
View File

@ -564,7 +564,7 @@ public class WPayment extends Window
* Get Data from Grid
*/
m_AD_Client_ID = ((Integer)m_mTab.getValue("AD_Client_ID")).intValue();
m_Cash_As_Payment = MSysConfig.getBooleanValue("CASH_AS_PAYMENT",true, m_AD_Client_ID);
m_Cash_As_Payment = MSysConfig.getBooleanValue(MSysConfig.CASH_AS_PAYMENT,true, m_AD_Client_ID);
m_AD_Org_ID = ((Integer)m_mTab.getValue("AD_Org_ID")).intValue();
m_C_BPartner_ID = ((Integer)m_mTab.getValue("C_BPartner_ID")).intValue();
m_PaymentRule = (String)m_mTab.getValue("PaymentRule");

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
View File

@ -339,7 +339,7 @@ public class WWFActivity extends ADForm implements EventListener
{
long start = System.currentTimeMillis();
int MAX_ACTIVITIES_IN_LIST = MSysConfig.getIntValue("MAX_ACTIVITIES_IN_LIST", 200, Env.getAD_Client_ID(Env.getCtx()));
int MAX_ACTIVITIES_IN_LIST = MSysConfig.getIntValue(MSysConfig.MAX_ACTIVITIES_IN_LIST, 200, Env.getAD_Client_ID(Env.getCtx()));
model = new ListModelTable();

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FolderBrowser.java
View File

@ -71,7 +71,7 @@ public class FolderBrowser extends Window implements EventListener
public FolderBrowser(String rootPath, boolean browseForFolder)
{
if (Util.isEmpty(rootPath)) {
rootPath = MSysConfig.getValue("ZK_ROOT_FOLDER_BROWSER", Ini.getAdempiereHome());
rootPath = MSysConfig.getValue(MSysConfig.ZK_ROOT_FOLDER_BROWSER, Ini.getAdempiereHome());
}
root = new File(rootPath);

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java
View File

@ -105,10 +105,6 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
private Map<Integer, String> columnWidthMap;
public static final String PAGE_SIZE_KEY = "ZK_PAGING_SIZE";
public static final String MODE_LESS_KEY = "ZK_GRID_EDIT_MODELESS";
public GridPanel()
{
this(0);
@ -133,11 +129,11 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
}
else
{
pageSize = MSysConfig.getIntValue(PAGE_SIZE_KEY, 100);
pageSize = MSysConfig.getIntValue(MSysConfig.ZK_PAGING_SIZE, 100);
}
//default true for better UI experience
modeless = MSysConfig.getBooleanValue(MODE_LESS_KEY, true);
modeless = MSysConfig.getBooleanValue(MSysConfig.ZK_GRID_EDIT_MODELESS, true);
}

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListPanel.java
View File

@ -79,8 +79,6 @@ public class ListPanel extends Borderlayout implements EventListener
private Map<Integer, String> columnWidthMap;
public static final String PAGE_SIZE_KEY = "ZK_PAGING_SIZE";
public ListPanel()
{
this(0);
@ -97,7 +95,7 @@ public class ListPanel extends Borderlayout implements EventListener
this.appendChild(south);
//default paging size
pageSize = MSysConfig.getIntValue(PAGE_SIZE_KEY, 100);
pageSize = MSysConfig.getIntValue(MSysConfig.ZK_PAGING_SIZE, 100);
}
/**

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java
View File

@ -27,7 +27,7 @@ import org.compiere.model.MMenu;
import org.compiere.model.MQuery;
import org.compiere.model.MTree;
import org.compiere.model.MTreeNode;
import org.compiere.model.SystemIDs;
import static org.compiere.model.SystemIDs.*;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env;
@ -56,7 +56,7 @@ import org.zkoss.zul.Vbox;
* @author Elaine
* @date November 20, 2008
*/
public class DPFavourites extends DashboardPanel implements EventListener<Event>, SystemIDs {
public class DPFavourites extends DashboardPanel implements EventListener<Event> {
private static final String ON_ADD_TAP_EVENT_LISTENER = "onAddTapEventListener";

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java
View File

@ -182,7 +182,7 @@ public class DPRecentItems extends DashboardPanel implements EventListener<Event
bxRecentItems.removeChild(comp);
}
int maxri = MSysConfig.getIntValue("RecentItems_MaxShown", 10, Env.getAD_Client_ID(Env.getCtx()));
int maxri = MSysConfig.getIntValue(MSysConfig.RecentItems_MaxShown, 10, Env.getAD_Client_ID(Env.getCtx()));
if (maxri <= 0)
return;

Some files were not shown because too many files have changed in this diff Show More