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

hg merge release-2.1 (merge release2.1 into development)

This commit is contained in:
Carlos Ruiz 2015-06-08 10:22:22 -05:00
parent 1ba9e2935c 9ea1cc3ff8
commit 0cb4c95f98
4 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java
View File

@ -48,7 +48,7 @@ public class ResetLockedAccount extends SvrProcess {
if (!user.isLocked()) if (!user.isLocked())
throw new AdempiereException(Msg.getMsg(getCtx(), "UserIsNotLocked", new Object[] {user.getName()})); throw new AdempiereException(Msg.getMsg(getCtx(), "UserIsNotLocked", new Object[] {user.getName()}));
StringBuilder sql = new StringBuilder ("UPDATE AD_User SET IsLocked = 'N', DateAccountLocked=NULL, FailedLoginCount=0, Updated=SysDate ") StringBuilder sql = new StringBuilder ("UPDATE AD_User SET IsLocked = 'N', DateAccountLocked=NULL, FailedLoginCount=0, DateLastLogin=NULL, Updated=SysDate ")
.append(" WHERE IsLocked='Y' AND AD_Client_ID = ? ") .append(" WHERE IsLocked='Y' AND AD_Client_ID = ? ")
.append(" AND DateAccountLocked IS NOT NULL ") .append(" AND DateAccountLocked IS NOT NULL ")
.append(" AND AD_User_ID = " + user.getAD_User_ID()); .append(" AND AD_User_ID = " + user.getAD_User_ID());
@ -64,7 +64,7 @@ public class ResetLockedAccount extends SvrProcess {
int MAX_ACCOUNT_LOCK_MINUTES = MSysConfig.getIntValue(MSysConfig.USER_LOCKING_MAX_ACCOUNT_LOCK_MINUTES, 0); int MAX_ACCOUNT_LOCK_MINUTES = MSysConfig.getIntValue(MSysConfig.USER_LOCKING_MAX_ACCOUNT_LOCK_MINUTES, 0);
int MAX_INACTIVE_PERIOD = MSysConfig.getIntValue(MSysConfig.USER_LOCKING_MAX_INACTIVE_PERIOD_DAY, 0); int MAX_INACTIVE_PERIOD = MSysConfig.getIntValue(MSysConfig.USER_LOCKING_MAX_INACTIVE_PERIOD_DAY, 0);
StringBuilder sql = new StringBuilder("UPDATE AD_User SET IsLocked = 'N', DateAccountLocked=NULL, FailedLoginCount=0, Updated=SysDate ") StringBuilder sql = new StringBuilder("UPDATE AD_User SET IsLocked = 'N', DateAccountLocked=NULL, FailedLoginCount=0, DateLastLogin=NULL, Updated=SysDate ")
.append(" WHERE IsLocked='Y' AND AD_Client_ID = ? ") .append(" WHERE IsLocked='Y' AND AD_Client_ID = ? ")
.append(" AND DateAccountLocked IS NOT NULL"); .append(" AND DateAccountLocked IS NOT NULL");

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

@ -448,8 +448,6 @@ public class ProcessParameterPanel extends Panel implements
for ( int i = 0; i<params.length; i++) for ( int i = 0; i<params.length; i++)
{ {
MPInstancePara para = params[i]; MPInstancePara para = params[i];
para.getParameterName();
if ( mField.getColumnName().equals(para.getParameterName()) ) if ( mField.getColumnName().equals(para.getParameterName()) )
{ {
@ -479,7 +477,7 @@ public class ProcessParameterPanel extends Panel implements
} }
} }
if (editor.getValue() != null) { if (editor.getValue() != null) {
ValueChangeEvent changeEvent = new ValueChangeEvent(editor, editor.getColumnName(), editor.getValue(), null); ValueChangeEvent changeEvent = new ValueChangeEvent(editor, editor.getColumnName(), null, editor.getValue());
valueChange(changeEvent); valueChange(changeEvent);
// Note that the second editor2 in ranges has no event verification // Note that the second editor2 in ranges has no event verification
} }

16
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java
View File

@ -174,24 +174,10 @@ public class WPAttributeEditor extends WEditor implements ContextMenuListener
// M_Product.M_AttributeSetInstance_ID = 8418 // M_Product.M_AttributeSetInstance_ID = 8418
final boolean productWindow = (gridField.getAD_Column_ID() == COLUMN_M_PRODUCT_M_ATTRIBUTESETINSTANCE_ID); // HARDCODED final boolean productWindow = (gridField.getAD_Column_ID() == COLUMN_M_PRODUCT_M_ATTRIBUTESETINSTANCE_ID); // HARDCODED
// Exclude ability to enter ASI
boolean exclude = true;
if (M_Product_ID != 0)
{
MProduct product = MProduct.get(Env.getCtx(), M_Product_ID);
int M_AttributeSet_ID = product.getM_AttributeSet_ID();
if (M_AttributeSet_ID != 0)
{
MAttributeSet mas = MAttributeSet.get(Env.getCtx(), M_AttributeSet_ID);
exclude = mas.excludeEntry(gridField.getAD_Column_ID(), Env.isSOTrx(Env.getCtx(), m_WindowNo));
}
}
if (M_ProductBOM_ID != 0) // Use BOM Component if (M_ProductBOM_ID != 0) // Use BOM Component
M_Product_ID = M_ProductBOM_ID; M_Product_ID = M_ProductBOM_ID;
// //
if (!productWindow && (M_Product_ID == 0 || exclude)) if (!productWindow && (M_Product_ID == 0))
{ {
getComponent().setText(null); getComponent().setText(null);
M_AttributeSetInstance_ID = 0; M_AttributeSetInstance_ID = 0;

1
org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
View File

@ -424,7 +424,6 @@ public class AbstractService {
int indDot = varName.indexOf("."); int indDot = varName.indexOf(".");
if (indDot == -1) { if (indDot == -1) {
if (varName.charAt(0) == '#') { if (varName.charAt(0) == '#') {
varName = varName.substring(1);
val = getCompiereService().getCtx().getProperty(varName); val = getCompiereService().getCtx().getProperty(varName);
} else { } else {
// If there is no table name, then it should be // If there is no table name, then it should be