diff --git a/src/org/openbravo/retail/stockcriteria/StockHQLCriteria.java b/src/org/openbravo/retail/stockcriteria/StockHQLCriteria.java
--- a/src/org/openbravo/retail/stockcriteria/StockHQLCriteria.java
+++ b/src/org/openbravo/retail/stockcriteria/StockHQLCriteria.java
@@ -20,10 +20,13 @@
 
   @Override
   public String getHQLFilter(String params) {
+    return getStock() + getCriteria(params) + "'$2') ";
+  }
+
+  public String getStock() {
     return "  exists ( select 1 from Product p where pli.product.id = p.id and (select sum(sd.quantityOnHand - sd.reservedQty) as stock from MaterialMgmtStorageDetail "
         + " as sd where sd.product.id = pli.product.id and exists "
-        + " ( SELECT 1 FROM OrganizationWarehouse as ow WHERE sd.storageBin.warehouse.id=ow.warehouse.id  and ow.organization.id = '$3'))"
-        + getCriteria(params) + "'$2') ";
+        + " ( SELECT 1 FROM OrganizationWarehouse as ow WHERE sd.storageBin.warehouse.id=ow.warehouse.id  and ow.organization.id = '$3'))";
   }
 
   private String getCriteria(String params) {
diff --git a/web/org.openbravo.retail.stockcriteria/js/hookStockCriteria.js b/web/org.openbravo.retail.stockcriteria/js/hookStockCriteria.js
--- a/web/org.openbravo.retail.stockcriteria/js/hookStockCriteria.js
+++ b/web/org.openbravo.retail.stockcriteria/js/hookStockCriteria.js
@@ -29,6 +29,7 @@
         caption: OB.I18N.getLabel('OBRPSC_FilterCaption'),
         text: OB.I18N.getLabel('OBRPSC_FilterButton'),
         forceRemote: true,
+        stockCriteriaQualifier:  'Stock_Filter',
         // Set default conditions
         defaults: [{
           condition: 'MORE_THAN',
@@ -71,7 +72,7 @@
               var stockFilter = {
                 columns: [],
                 operator: OB.Dal.FILTER,
-                value: 'Stock_Filter',
+                value: this.stockCriteriaQualifier,
                 params: [this.conditions[i].condition, this.conditions[i].value, OB.MobileApp.model.get('context').organization.id]
               };
               criteria.push(stockFilter);