0033602: LoginUtils.fillSessionArguments (query Attribute.selectOrgCurrency quite slow) around 100ms with many orgs

diff -r 6df19843e498 src/org/openbravo/base/secureApp/Attribute_data.xsql
--- a/src/org/openbravo/base/secureApp/Attribute_data.xsql	Thu Jun 30 19:41:31 2016 +0200
+++ b/src/org/openbravo/base/secureApp/Attribute_data.xsql	Tue Aug 02 15:36:54 2016 +0200
@@ -74,6 +74,7 @@
           SELECT C_CURRENCY_ID 
           FROM AD_ORG 
           WHERE AD_ISORGINCLUDED(?,AD_ORG_ID,?) <> -1 AND C_CURRENCY_ID IS NOT NULL
+          AND AD_ORG_ID IN ('1') 
           ORDER BY AD_ISORGINCLUDED(?,AD_ORG_ID,?)
         ]]>
       </Sql>
@@ -81,5 +82,6 @@
       <Parameter name="client"/>
       <Parameter name="organization"/>
       <Parameter name="client"/>
+      <Parameter name="orglist" optional="true" type="replace" after="AND AD_ORG_ID IN (" text="'1'"/>
    </SqlMethod>
 </SqlClass>
diff -r 6df19843e498 src/org/openbravo/base/secureApp/LoginUtils.java
--- a/src/org/openbravo/base/secureApp/LoginUtils.java	Thu Jun 30 19:41:31 2016 +0200
+++ b/src/org/openbravo/base/secureApp/LoginUtils.java	Tue Aug 02 15:36:54 2016 +0200
@@ -240,6 +240,7 @@
     // Organizations tree
     // enable admin mode, as normal non admin-role
     // has no read-access to i.e. AD_OrgType
+    String ascTree = null;
     OBContext.setAdminMode();
     try {
       client = OBDal.getInstance().get(Client.class, strCliente);
@@ -248,6 +249,10 @@
       vars.setSessionObject("#CompleteOrgTree", tree);
       OrgTree accessibleTree = tree.getAccessibleTree(conn, strRol);
       vars.setSessionValue("#AccessibleOrgTree", accessibleTree.toString());
+
+      ascTree = tree.getAscendantTree(strOrg).toString();
+      log4j.info("asc-tree is: " + ascTree);
+
     } catch (Exception e) {
       log4j.warn("Error while setting Organzation tree to session " + e);
       return false;
@@ -257,7 +262,7 @@
 
     try {
       // set organization currency
-      orgCurrency = AttributeData.selectOrgCurrency(conn, strOrg, strCliente);
+      orgCurrency = AttributeData.selectOrgCurrency(conn, strOrg, strCliente, ascTree);
 
       SeguridadData[] data = SeguridadData.select(conn, strRol, strUserAuth);
       if (data == null || data.length == 0) {