From 6b50b40a423953ad8f1faa2923004ab4b4623b46 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 6 Feb 2013 08:26:39 -0500 Subject: [PATCH] IDEMPIERE-600 Use User Org Access in Role didn't work - thanks to Juliana Corredor --- org.adempiere.base/src/org/compiere/util/Login.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/util/Login.java b/org.adempiere.base/src/org/compiere/util/Login.java index 1bcfe90733..1b440bbb1a 100644 --- a/org.adempiere.base/src/org/compiere/util/Login.java +++ b/org.adempiere.base/src/org/compiere/util/Login.java @@ -532,12 +532,9 @@ public class Login // String sql = " SELECT DISTINCT r.UserLevel, r.ConnectionProfile,o.AD_Org_ID,o.Name,o.IsSummary " +" FROM AD_Org o" - +" INNER JOIN AD_Role_OrgAccess ra ON (ra.AD_Org_ID=o.AD_Org_ID)" - +" INNER JOIN AD_Role r on (ra.AD_Role_ID=r.AD_Role_ID) " - +" INNER JOIN AD_Client c on (ra.AD_Client_ID=c.AD_Client_ID)" - +" WHERE r.AD_Role_ID=?" - +" AND c.AD_Client_ID=?" - +" AND o.IsActive='Y' " + +" INNER JOIN AD_Role r on (r.AD_Role_ID=?)" + +" INNER JOIN AD_Client c on (c.AD_Client_ID=?)" + +" WHERE o.IsActive='Y' " +" AND o.IsSummary='N'" +" AND (r.IsAccessAllOrgs='Y'" +" OR (r.IsUseUserOrgAccess='N' AND o.AD_Org_ID IN (SELECT AD_Org_ID FROM AD_Role_OrgAccess ra"