diff --git a/org.adempiere.base.callout/.classpath b/org.adempiere.base.callout/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.adempiere.base.callout/.classpath
+++ b/org.adempiere.base.callout/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.base.process/.classpath b/org.adempiere.base.process/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.adempiere.base.process/.classpath
+++ b/org.adempiere.base.process/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index 45217db393..a295526ee3 100755
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -1,17 +1,27 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.base/src/org/compiere/util/Login.java b/org.adempiere.base/src/org/compiere/util/Login.java
index 39e9056ef2..890a087a04 100644
--- a/org.adempiere.base/src/org/compiere/util/Login.java
+++ b/org.adempiere.base/src/org/compiere/util/Login.java
@@ -558,7 +558,7 @@ public class Login
ArrayList list = new ArrayList();
KeyNamePair[] retValue = null;
//
- String sql = " SELECT DISTINCT r.UserLevel, r.ConnectionProfile,o.AD_Org_ID,o.Name,o.IsSummary,r.RoleType,r.IsClientAdministrator "
+ String sql = " SELECT DISTINCT r.UserLevel, r.ConnectionProfile,o.AD_Org_ID,o.Name, 'N' as IsSummary,r.RoleType,r.IsClientAdministrator "
+" FROM AD_Org o"
+" INNER JOIN AD_Role r on (r.AD_Role_ID=?)"
+" INNER JOIN AD_Client c on (c.AD_Client_ID=?)"
diff --git a/org.adempiere.eclipse.equinox.http.servlet/.classpath b/org.adempiere.eclipse.equinox.http.servlet/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.adempiere.eclipse.equinox.http.servlet/.classpath
+++ b/org.adempiere.eclipse.equinox.http.servlet/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.install/.classpath b/org.adempiere.install/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.adempiere.install/.classpath
+++ b/org.adempiere.install/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.payment.processor/.classpath b/org.adempiere.payment.processor/.classpath
index ef8cb85c43..a0b008102c 100755
--- a/org.adempiere.payment.processor/.classpath
+++ b/org.adempiere.payment.processor/.classpath
@@ -1,10 +1,24 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.pipo.handlers/.classpath b/org.adempiere.pipo.handlers/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.adempiere.pipo.handlers/.classpath
+++ b/org.adempiere.pipo.handlers/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.pipo/.classpath b/org.adempiere.pipo/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.adempiere.pipo/.classpath
+++ b/org.adempiere.pipo/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.plugin.utils/.classpath b/org.adempiere.plugin.utils/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.adempiere.plugin.utils/.classpath
+++ b/org.adempiere.plugin.utils/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.replication.server/.classpath b/org.adempiere.replication.server/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.adempiere.replication.server/.classpath
+++ b/org.adempiere.replication.server/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.replication/.classpath b/org.adempiere.replication/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.adempiere.replication/.classpath
+++ b/org.adempiere.replication/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 6951510c0d..8ec9636d88 100755
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,8 +1,8 @@
-
+
-
+
@@ -14,5 +14,10 @@
+
+
+
+
+
diff --git a/org.adempiere.report.jasper/.classpath b/org.adempiere.report.jasper/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.adempiere.report.jasper/.classpath
+++ b/org.adempiere.report.jasper/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.server/.classpath b/org.adempiere.server/.classpath
index be91c8380c..e471a71533 100755
--- a/org.adempiere.server/.classpath
+++ b/org.adempiere.server/.classpath
@@ -1,13 +1,33 @@
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath
index 3e466c52b1..5990ba575b 100755
--- a/org.adempiere.ui.zk/.classpath
+++ b/org.adempiere.ui.zk/.classpath
@@ -1,10 +1,24 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.ui/.classpath b/org.adempiere.ui/.classpath
index 48b71eaba3..3093e1498f 100755
--- a/org.adempiere.ui/.classpath
+++ b/org.adempiere.ui/.classpath
@@ -1,10 +1,24 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.apache.ecs/.classpath b/org.apache.ecs/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.apache.ecs/.classpath
+++ b/org.apache.ecs/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.compiere.db.oracle.provider/.classpath
+++ b/org.compiere.db.oracle.provider/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath
index 5933dd2d11..7931ec26b9 100755
--- a/org.compiere.db.postgresql.provider/.classpath
+++ b/org.compiere.db.postgresql.provider/.classpath
@@ -1,11 +1,21 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.felix.webconsole/.classpath b/org.idempiere.felix.webconsole/.classpath
index 5508535a40..7931ec26b9 100755
--- a/org.idempiere.felix.webconsole/.classpath
+++ b/org.idempiere.felix.webconsole/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.hazelcast.service/.classpath b/org.idempiere.hazelcast.service/.classpath
index 29152ddc53..510920eed6 100755
--- a/org.idempiere.hazelcast.service/.classpath
+++ b/org.idempiere.hazelcast.service/.classpath
@@ -1,8 +1,22 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.javadoc/.classpath b/org.idempiere.javadoc/.classpath
index c362d17e13..f7573c1b32 100755
--- a/org.idempiere.javadoc/.classpath
+++ b/org.idempiere.javadoc/.classpath
@@ -1,6 +1,15 @@
-
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.jetty.osgi.boot.fragment/.classpath b/org.idempiere.jetty.osgi.boot.fragment/.classpath
index fe1a205326..7931ec26b9 100755
--- a/org.idempiere.jetty.osgi.boot.fragment/.classpath
+++ b/org.idempiere.jetty.osgi.boot.fragment/.classpath
@@ -1,11 +1,21 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.keikai/.classpath b/org.idempiere.keikai/.classpath
index 6e08334f9d..ed192de391 100755
--- a/org.idempiere.keikai/.classpath
+++ b/org.idempiere.keikai/.classpath
@@ -1,17 +1,26 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.printformat.editor/.classpath b/org.idempiere.printformat.editor/.classpath
index fe1a205326..7931ec26b9 100755
--- a/org.idempiere.printformat.editor/.classpath
+++ b/org.idempiere.printformat.editor/.classpath
@@ -1,11 +1,21 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.test/.classpath b/org.idempiere.test/.classpath
index 0a5221f787..7931ec26b9 100755
--- a/org.idempiere.test/.classpath
+++ b/org.idempiere.test/.classpath
@@ -1,14 +1,20 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
diff --git a/org.idempiere.webservices.resources/.classpath b/org.idempiere.webservices.resources/.classpath
index fe1a205326..7931ec26b9 100644
--- a/org.idempiere.webservices.resources/.classpath
+++ b/org.idempiere.webservices.resources/.classpath
@@ -1,11 +1,21 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.zk.billboard.chart/.classpath b/org.idempiere.zk.billboard.chart/.classpath
index 8d8612144f..7931ec26b9 100755
--- a/org.idempiere.zk.billboard.chart/.classpath
+++ b/org.idempiere.zk.billboard.chart/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.zk.billboard/.classpath b/org.idempiere.zk.billboard/.classpath
index 8d8612144f..7931ec26b9 100755
--- a/org.idempiere.zk.billboard/.classpath
+++ b/org.idempiere.zk.billboard/.classpath
@@ -1,7 +1,21 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath
index 9ad1f1292d..ee6f9b3317 100755
--- a/org.idempiere.zk.extra/.classpath
+++ b/org.idempiere.zk.extra/.classpath
@@ -1,8 +1,17 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
@@ -10,5 +19,10 @@
+
+
+
+
+