0031268: SimpleQueryBuilder replacement order of criterias is incorrect.

# HG changeset patch
# User Adrián Romero <adrianromero@openbravo.com>
# Date 1445949275 -3600
#      Tue Oct 27 13:34:35 2015 +0100
# Node ID 60e7a5965b7675080ff76b43e823819d5ed2f80e
# Parent  8e517c8e2c1c92efc95045b6f1d57c437044b7c1
Fixes issue 0031268: SimpleQueryBuilder replacement order of criterias is incorrect.
*  and  are moved to the begining of the method getHQLQuery() to avoid dependency problems

diff --git a/src/org/openbravo/mobile/core/process/SimpleQueryBuilder.java b/src/org/openbravo/mobile/core/process/SimpleQueryBuilder.java
--- a/src/org/openbravo/mobile/core/process/SimpleQueryBuilder.java
+++ b/src/org/openbravo/mobile/core/process/SimpleQueryBuilder.java
@@ -430,6 +430,11 @@
 
     String newhql = hql;
 
+    // These two filters: $filtersCriteria and $hqlCriteria must be done at the very beginning
+    // because can include other tags like $naturalOrgCriteria, ...
+    newhql = replaceAll(newhql, "$filtersCriteria", new FiltersCriteria(filters, properties));
+    newhql = replaceAll(newhql, "$hqlCriteria", new HQLCriteria(filters, hqlCriteria));
+
     newhql = replaceAll(newhql, "$clientCriteria", new ClientCriteria());
 
     newhql = replaceAll(newhql, "$orgCriteria", new OrganizationCriteria());
@@ -451,9 +456,6 @@
     newhql = replaceAll(newhql, "$userId", new UserId());
     newhql = replaceAll(newhql, "$languageId", new LanguageId());
 
-    newhql = replaceAll(newhql, "$filtersCriteria", new FiltersCriteria(filters, properties));
-    newhql = replaceAll(newhql, "$hqlCriteria", new HQLCriteria(filters, hqlCriteria));
-
     return newhql;
   }