0036167: Tree view of Tab is not correctly filtered if tab has where clause

diff --git a/src-db/database/sourcedata/AD_TAB.xml b/src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml
+++ b/src-db/database/sourcedata/AD_TAB.xml
@@ -1578,11 +1578,14 @@
 <!--178-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
 <!--178-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--178-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--178-->  <WHERECLAUSE><![CDATA[IsActive= 'Y' OR Isvirtual= 'N']]></WHERECLAUSE>
 <!--178-->  <PROCESSING><![CDATA[N]]></PROCESSING>
 <!--178-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--178-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--178-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--178-->  <HQLWHERECLAUSE><![CDATA[active = 'Y' or isvirtual= 'N']]></HQLWHERECLAUSE>
 <!--178-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--178-->  <AD_TABLE_TREE_ID><![CDATA[9C8C6FF169194D1B9E2C4C97442398D5]]></AD_TABLE_TREE_ID>
 <!--178-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--178-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--178-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
diff --git a/src-db/database/sourcedata/AD_TABLE.xml b/src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml
+++ b/src-db/database/sourcedata/AD_TABLE.xml
@@ -1266,7 +1266,7 @@
 <!--207-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--207-->  <AD_PACKAGE_ID><![CDATA[5A3ED54AB1D54B84E040007F01006125]]></AD_PACKAGE_ID>
 <!--207-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
-<!--207-->  <ISTREE><![CDATA[N]]></ISTREE>
+<!--207-->  <ISTREE><![CDATA[Y]]></ISTREE>
 <!--207--></AD_TABLE>
 
 <!--208--><AD_TABLE>
diff --git a/src-db/database/sourcedata/AD_TABLE_TREE.xml b/src-db/database/sourcedata/AD_TABLE_TREE.xml
--- a/src-db/database/sourcedata/AD_TABLE_TREE.xml
+++ b/src-db/database/sourcedata/AD_TABLE_TREE.xml
@@ -173,6 +173,26 @@
 <!--9C0304E9DC464C7495AAAC88958E1297-->  <NODEDELETIONPOLICY><![CDATA[RCN]]></NODEDELETIONPOLICY>
 <!--9C0304E9DC464C7495AAAC88958E1297--></AD_TABLE_TREE>
 
+<!--9C8C6FF169194D1B9E2C4C97442398D5--><AD_TABLE_TREE>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <AD_TABLE_TREE_ID><![CDATA[9C8C6FF169194D1B9E2C4C97442398D5]]></AD_TABLE_TREE_ID>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <AD_TABLE_ID><![CDATA[207]]></AD_TABLE_ID>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <LINKTOPARENTCOLUMN><![CDATA[F0AE8CC323DA4C389F508CCA7686EE6D]]></LINKTOPARENTCOLUMN>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <NODEIDCOLUMN><![CDATA[1389]]></NODEIDCOLUMN>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <HASMULTIPARENTNODES><![CDATA[N]]></HASMULTIPARENTNODES>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <APPLYWHERECLAUSETOCHILDNODES><![CDATA[Y]]></APPLYWHERECLAUSETOCHILDNODES>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <NAME><![CDATA[Locator Tree]]></NAME>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <ISPARENTSELECTIONALLOWED><![CDATA[Y]]></ISPARENTSELECTIONALLOWED>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <ISORDERED><![CDATA[N]]></ISORDERED>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <TREESTRUCTURE><![CDATA[LinkToParent]]></TREESTRUCTURE>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <ISHANDLENODESMANUALLY><![CDATA[N]]></ISHANDLENODESMANUALLY>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <ISMAINTREE><![CDATA[Y]]></ISMAINTREE>
+<!--9C8C6FF169194D1B9E2C4C97442398D5-->  <NODEDELETIONPOLICY><![CDATA[DNAIHC]]></NODEDELETIONPOLICY>
+<!--9C8C6FF169194D1B9E2C4C97442398D5--></AD_TABLE_TREE>
+
 <!--9D548EFC27864320A3E8E4C62CD6D28D--><AD_TABLE_TREE>
 <!--9D548EFC27864320A3E8E4C62CD6D28D-->  <AD_TABLE_TREE_ID><![CDATA[9D548EFC27864320A3E8E4C62CD6D28D]]></AD_TABLE_TREE_ID>
 <!--9D548EFC27864320A3E8E4C62CD6D28D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-test/src/org/openbravo/test/inventoryStatus/InventoryStatusTest.java b/src-test/src/org/openbravo/test/inventoryStatus/InventoryStatusTest.java
--- a/src-test/src/org/openbravo/test/inventoryStatus/InventoryStatusTest.java
+++ b/src-test/src/org/openbravo/test/inventoryStatus/InventoryStatusTest.java
@@ -212,6 +212,10 @@
       changeBinToUndefOverIssueStatus(storageBin);
       assertThatBinHasUndefOverIssueStatus(storageBin);
 
+      for (int i = 0; i < 500; i++) {
+        cloneStorageBin(LOCATOR_USA111_ID, "IS00X" + i);
+      }
+
     } catch (Exception e) {
       log.error(e.getMessage(), e);
       throw new OBException(e);

diff --git a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java
@@ -236,7 +236,7 @@
     boolean allowNotApplyingWhereClauseToChildren = !tableTree.isApplyWhereClauseToChildNodes();
     if ((fetchRoot || !allowNotApplyingWhereClauseToChildren) && hqlWhereClause != null) {
       // Include the hql where clause for all root nodes and for child nodes only if it is required
-      whereClause.append(hqlWhereClause + " and ");
+      whereClause.append("(" + hqlWhereClause + ") and ");
     }
 
     if (hqlWhereClauseRootNodes != null && fetchRoot) {
@@ -555,7 +555,7 @@
       whereClause.append(".id");
     }
     whereClause.append(" = ? ");
-    whereClause.append(" and " + hqlWhereClause);
+    whereClause.append(" and (" + hqlWhereClause + ")");
     final OBQuery<BaseOBObject> query = OBDal.getInstance().createQuery(entity.getName(),
         whereClause.toString());