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

IDEMPIERE-1733 Cannot change Currency To in window Currency Rate / two special cases of foreign keys as String

This commit is contained in:
Carlos Ruiz 2015-02-26 19:52:15 -05:00
parent 8e03122c9e
commit e2016a6b77
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ public class ResetLockedAccount extends SvrProcess {
.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());
int no = DB.executeUpdate(sql.toString(), new Object[] { p_AD_Client_ID }, false, get_TrxName()); int no = DB.executeUpdate(sql.toString(), new Object[] { p_AD_Client_ID }, false, get_TrxName());
if (no < 0) if (no <= 0)
throw new AdempiereException("Could not unlock user account" + user.toString()); throw new AdempiereException("Could not unlock user account" + user.toString());
StringBuilder msgreturn = new StringBuilder("@OK@ - The user '").append(user.getName()).append("' has been unlocked"); StringBuilder msgreturn = new StringBuilder("@OK@ - The user '").append(user.getName()).append("' has been unlocked");

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

@ -3208,7 +3208,7 @@ public class GridTable extends AbstractTableModel
columnName = field.getColumnName(); columnName = field.getColumnName();
displayType = field.getDisplayType(); displayType = field.getDisplayType();
// Integer, ID, Lookup // Integer, ID, Lookup
if (displayType == DisplayType.Integer || DisplayType.isID(displayType)) if (displayType == DisplayType.Integer || (DisplayType.isID(displayType) && !(columnName.equals("EntityType") || columnName.equals("AD_Language"))))
{ {
rowData[j] = new Integer(rs.getInt(j+1)); // Integer rowData[j] = new Integer(rs.getInt(j+1)); // Integer
if (rs.wasNull()) if (rs.wasNull())