0038491: Low performance in the order selector of verified returns

diff -r 6c267fe86598 -r a84cb7964a1a src/org/openbravo/retail/posterminal/PaidReceiptsHeader.java
--- a/src/org/openbravo/retail/posterminal/PaidReceiptsHeader.java	Mon Mar 26 18:32:09 2018 +0200
+++ b/src/org/openbravo/retail/posterminal/PaidReceiptsHeader.java	Thu May 03 15:46:17 2018 +0200
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012-2017 Openbravo S.L.U.
+ * Copyright (C) 2012-2018 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -29,6 +29,9 @@
 public class PaidReceiptsHeader extends ProcessHQLQuery {
   public static final Logger log = Logger.getLogger(PaidReceiptsHeader.class);
 
+  private static final String BPFILTER_QUERY = "BP";
+  private static final String DOCUMENTNOFILTER_QUERY = "DOCNO";
+
   @Inject
   @Any
   private Instance<PaidReceiptsHeaderHook> paidReceiptHeaderHooks;
@@ -57,6 +60,7 @@
       Map<String, Object> paramValues = new HashMap<String, Object>();
 
       paramValues.put("organization", jsonsent.getString("organization"));
+      paramValues.put("client", OBContext.getOBContext().getCurrentClient().getId());
       JSONObject json = jsonsent.getJSONObject("filters");
       if (!json.getString("filterText").isEmpty()) {
         if (useContains) {
@@ -94,7 +98,13 @@
   @Override
   protected List<String> getQuery(JSONObject jsonsent) throws JSONException {
 
-    // OBContext.setAdminMode(true);
+    String hqlPaidReceiptsBP = getBPorDocumentNoQuery(jsonsent, BPFILTER_QUERY);
+    String hqlPaidReceiptsDocNo = getBPorDocumentNoQuery(jsonsent, DOCUMENTNOFILTER_QUERY);
+    return Arrays.asList(new String[] { hqlPaidReceiptsBP, hqlPaidReceiptsDocNo });
+  }
+
+  private String getBPorDocumentNoQuery(JSONObject jsonsent, final String queryFilter)
+      throws JSONException {
     JSONObject json = jsonsent.getJSONObject("filters");
     String strIsLayaway = "false";
     if (json.getBoolean("isLayaway")) {
@@ -104,13 +114,12 @@
         + "ord.businessPartner.name as businessPartner, ord.grandTotalAmount as totalamount, ord.documentType.id as documentTypeId, '"
         + strIsLayaway
         + "' as isLayaway from Order as ord "
-        + "where ord.client='"
-        + json.getString("client")
-        + "' and ord.organization.id= :organization"
+        + "where ord.client.id = :client and ord.organization.id= :organization"
         + " and ord.obposIsDeleted = false ";
 
     if (!json.getString("filterText").isEmpty()) {
-      String hqlFilter = "ord.documentNo like :filterT1 or upper(ord.businessPartner.name) like upper(:filterT1)";
+      String hqlFilter = "";
+      hqlFilter = appendBPorDOCNOFilter(queryFilter);
       for (PaidReceiptsHeaderHook hook : paidReceiptHeaderHooks) {
         try {
           String hql = hook.exec(hqlFilter, json.getString("filterText"));
@@ -148,7 +157,17 @@
     }
 
     hqlPaidReceipts += " order by ord.orderDate desc, ord.documentNo desc";
-    return Arrays.asList(new String[] { hqlPaidReceipts });
+    return hqlPaidReceipts;
+  }
+
+  private String appendBPorDOCNOFilter(final String queryFilter) {
+    String hqlFilter;
+    if (BPFILTER_QUERY.equals(queryFilter)) {
+      hqlFilter = "upper(ord.businessPartner.name) like upper(:filterT1)";
+    } else {
+      hqlFilter = "upper(ord.documentNo) like upper(:filterT1)";
+    }
+    return hqlFilter;
   }
 
   @Override
diff -r 6c267fe86598 -r a84cb7964a1a web/org.openbravo.retail.posterminal/js/components/modalmultiorders.js
--- a/web/org.openbravo.retail.posterminal/js/components/modalmultiorders.js	Mon Mar 26 18:32:09 2018 +0200
+++ b/web/org.openbravo.retail.posterminal/js/components/modalmultiorders.js	Thu May 03 15:46:17 2018 +0200
@@ -223,7 +223,11 @@
   }],
   cleanFilter: false,
   clearAction: function (inSender, inEvent) {
-    this.multiOrdersList.reset();
+    this.multiOrdersList.reset(this.multiOrdersList.filter(function (order) {
+      if (order.get('checked')) {
+        return true;
+      }
+    }));
     return true;
   },
   disableFilters: function (value) {
@@ -456,6 +460,7 @@
     var me = this;
     this.$.header.$.modalMultiOrdersTopHeader.$.title.setContent(OB.I18N.getLabel('OBPOS_LblMultiOrders'));
     this.$.body.$.listMultiOrders.cleanFilter = true;
+    me.$.body.$.listMultiOrders.multiOrdersList.reset();
     if (!this.args.keepFiltersOnClose) {
       this.$.header.$.modalMultiOrdersTopHeader.disableDoneButton(true);
       this.$.body.$.listMultiOrders.$.multiorderslistitemprinter.$.theader.$.modalMultiOrdersHeader.clearAction();