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

Merge 5789b9435fda

This commit is contained in:
Heng Sin Low 2013-03-21 13:40:31 +08:00
parent 8af496019d 98b63c1415
commit 771d092e5f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,15 +142,18 @@ public class AbstractService {
return "Error logging in - org not allowed for this role";
KeyNamePair[] warehouses = login.getWarehouses(new KeyNamePair(loginRequest.getOrgID(), ""));
boolean okwh = false;
for (KeyNamePair warehouse : warehouses) {
if (warehouse.getKey() == loginRequest.getWarehouseID()) {
okwh = true;
break;
if (warehouses != null)
{
boolean okwh = false;
for (KeyNamePair warehouse : warehouses) {
if (warehouse.getKey() == loginRequest.getWarehouseID()) {
okwh = true;
break;
}
}
if (!okwh)
return "Error logging in - warehouse not allowed for this org";
}
if (!okwh)
return "Error logging in - warehouse not allowed for this org";
String error = login.validateLogin(orglogin);
if (error != null && error.length() > 0)