From a415621def016bda944827854584a31bda4252bd Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 29 May 2015 10:13:08 -0500 Subject: [PATCH 1/4] IDEMPIERE-1800 Reset Locked Account shows all clients / IDEMPIERE-373 / partial backout of b2dd142 - DateLastLogin=NULL is required --- .../src/org/adempiere/process/ResetLockedAccount.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java b/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java index 6876d871a6..2a4f5282d2 100644 --- a/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java +++ b/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java @@ -48,7 +48,7 @@ public class ResetLockedAccount extends SvrProcess { if (!user.isLocked()) 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(" AND DateAccountLocked IS NOT NULL ") .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_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(" AND DateAccountLocked IS NOT NULL"); From e2844a9c635db3298fafb4712af981ec91a113ce Mon Sep 17 00:00:00 2001 From: Deepak Pansheriya Date: Mon, 25 May 2015 20:17:58 +0530 Subject: [PATCH 2/4] IDEMPIERE-2626 : Allowing to enter manual ASI on lines while even table is on exclude rule --- .../webui/editor/WPAttributeEditor.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java index 7823f0fc09..f12cb408f5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java @@ -174,24 +174,10 @@ public class WPAttributeEditor extends WEditor implements ContextMenuListener // M_Product.M_AttributeSetInstance_ID = 8418 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 M_Product_ID = M_ProductBOM_ID; // - if (!productWindow && (M_Product_ID == 0 || exclude)) + if (!productWindow && (M_Product_ID == 0)) { getComponent().setText(null); M_AttributeSetInstance_ID = 0; From 476c843c9814d893de74af9e20c4922d7a91addd Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 3 Jun 2015 10:31:34 -0500 Subject: [PATCH 3/4] IDEMPIERE-2613 Process saved params doesn't update Display and ReadOnly Logics --- .../src/org/adempiere/webui/apps/ProcessParameterPanel.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java index 698f8cf792..2bd2eb006f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java @@ -485,8 +485,6 @@ public class ProcessParameterPanel extends Panel implements for ( int i = 0; i Date: Wed, 3 Jun 2015 16:28:55 -0500 Subject: [PATCH 4/4] IDEMPIERE-2655 Get Context Variable Error in WebService queryData --- .../WEB-INF/src/org/idempiere/webservices/AbstractService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java index ce4df95dbb..a7d1d347b8 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java @@ -424,7 +424,6 @@ public class AbstractService { int indDot = varName.indexOf("."); if (indDot == -1) { if (varName.charAt(0) == '#') { - varName = varName.substring(1); val = getCompiereService().getCtx().getProperty(varName); } else { // If there is no table name, then it should be