Merge 13a18834bb9d

This commit is contained in:
Heng Sin Low 2013-03-21 14:30:48 +08:00
commit 9b89a3cfa2
1 changed files with 2 additions and 0 deletions

View File

@ -154,6 +154,8 @@ public class AbstractService {
if (!okwh) if (!okwh)
return "Error logging in - warehouse not allowed for this org"; return "Error logging in - warehouse not allowed for this org";
} }
else if (warehouses == null && loginRequest.getWarehouseID() > 0)
return "Error logging in - warehouse not allowed for this org";
String error = login.validateLogin(orglogin); String error = login.validateLogin(orglogin);
if (error != null && error.length() > 0) if (error != null && error.length() > 0)