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

Merge fixes done in qa - not in trunk 

----------------------------------
globalqss - Revision 8187
Fix bug introduced with revision 5858
[2030877] - https://sourceforge.net/tracker2/index.php?func=detail&aid=2030877&group_id=176962&atid=879335
----------------------------------
globalqss - Revision 8185
Minor - just comment - annotating an important TODO
----------------------------------
This commit is contained in:
Carlos Ruiz 2009-02-04 19:37:42 +00:00
parent 2820e8143d
commit 0050cf6614
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/org/compiere/model/MUser.java
View File

@ -164,6 +164,8 @@ public class MUser extends X_AD_User
int AD_Client_ID = Env.getAD_Client_ID(ctx); int AD_Client_ID = Env.getAD_Client_ID(ctx);
MUser retValue = null; MUser retValue = null;
/* TODO: Implement same validation as in Login.java -
* about (SELECT IsEncrypted FROM AD_Column WHERE AD_Column_ID=417)='N') */
String sql = "SELECT * FROM AD_User " String sql = "SELECT * FROM AD_User "
+ "WHERE Name=? AND (Password=? OR Password=?) AND IsActive='Y' AND AD_Client_ID=?"; + "WHERE Name=? AND (Password=? OR Password=?) AND IsActive='Y' AND AD_Client_ID=?";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;

5
client/src/org/compiere/apps/form/VInOutGen.java
View File

@ -281,10 +281,7 @@ public class VInOutGen extends CPanel
+ "WHERE ic.AD_Org_ID=o.AD_Org_ID" + "WHERE ic.AD_Org_ID=o.AD_Org_ID"
+ " AND ic.C_BPartner_ID=bp.C_BPartner_ID" + " AND ic.C_BPartner_ID=bp.C_BPartner_ID"
+ " AND ic.C_DocType_ID=dt.C_DocType_ID" + " AND ic.C_DocType_ID=dt.C_DocType_ID"
+ " AND ic.AD_Client_ID=?" + " AND ic.AD_Client_ID=?");
+ " AND NOT EXISTS (SELECT * FROM M_InOut i, M_InOutLine il, C_OrderLine ol"
+ " WHERE ol.C_Order_ID=ic.C_Order_ID AND i.M_InOut_ID = il.M_InOut_ID AND"
+ " il.C_OrderLine_ID = ol.C_OrderLine_ID AND i.DocStatus IN ('IP', 'CO', 'CL')) ");
if (m_M_Warehouse_ID != null) if (m_M_Warehouse_ID != null)
sql.append(" AND ic.M_Warehouse_ID=").append(m_M_Warehouse_ID); sql.append(" AND ic.M_Warehouse_ID=").append(m_M_Warehouse_ID);