0034075: [SER-QA 1810] Having stockcriteria, when a product search fails, can show wrong error messages

diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -290,6 +290,18 @@
 <!--1EE0FF043B0D40968E891A9FA0FB6220-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--1EE0FF043B0D40968E891A9FA0FB6220--></AD_MESSAGE>
 
+<!--23CD45135F5A49269CB0B04A1A6F01F6--><AD_MESSAGE>
+<!--23CD45135F5A49269CB0B04A1A6F01F6-->  <AD_MESSAGE_ID><![CDATA[23CD45135F5A49269CB0B04A1A6F01F6]]></AD_MESSAGE_ID>
+<!--23CD45135F5A49269CB0B04A1A6F01F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--23CD45135F5A49269CB0B04A1A6F01F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--23CD45135F5A49269CB0B04A1A6F01F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--23CD45135F5A49269CB0B04A1A6F01F6-->  <VALUE><![CDATA[OBMOBC_ConnectionFail]]></VALUE>
+<!--23CD45135F5A49269CB0B04A1A6F01F6-->  <MSGTEXT><![CDATA[Connection error]]></MSGTEXT>
+<!--23CD45135F5A49269CB0B04A1A6F01F6-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--23CD45135F5A49269CB0B04A1A6F01F6-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--23CD45135F5A49269CB0B04A1A6F01F6-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--23CD45135F5A49269CB0B04A1A6F01F6--></AD_MESSAGE>
+
 <!--253558909F754D2AA9B41C6150B9F6B0--><AD_MESSAGE>
 <!--253558909F754D2AA9B41C6150B9F6B0-->  <AD_MESSAGE_ID><![CDATA[253558909F754D2AA9B41C6150B9F6B0]]></AD_MESSAGE_ID>
 <!--253558909F754D2AA9B41C6150B9F6B0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1179,6 +1191,18 @@
 <!--972B3FAA353944BDA2A6976A7AB610BF-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--972B3FAA353944BDA2A6976A7AB610BF--></AD_MESSAGE>
 
+<!--99099E7A072B48B2AD7AE0786B875F35--><AD_MESSAGE>
+<!--99099E7A072B48B2AD7AE0786B875F35-->  <AD_MESSAGE_ID><![CDATA[99099E7A072B48B2AD7AE0786B875F35]]></AD_MESSAGE_ID>
+<!--99099E7A072B48B2AD7AE0786B875F35-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--99099E7A072B48B2AD7AE0786B875F35-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--99099E7A072B48B2AD7AE0786B875F35-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--99099E7A072B48B2AD7AE0786B875F35-->  <VALUE><![CDATA[OBMOBC_RemoteConnectionFail]]></VALUE>
+<!--99099E7A072B48B2AD7AE0786B875F35-->  <MSGTEXT><![CDATA[Connection error. The information will be searched locally.]]></MSGTEXT>
+<!--99099E7A072B48B2AD7AE0786B875F35-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--99099E7A072B48B2AD7AE0786B875F35-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--99099E7A072B48B2AD7AE0786B875F35-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--99099E7A072B48B2AD7AE0786B875F35--></AD_MESSAGE>
+
 <!--9925F9856B92417CA4119158FDA68B12--><AD_MESSAGE>
 <!--9925F9856B92417CA4119158FDA68B12-->  <AD_MESSAGE_ID><![CDATA[9925F9856B92417CA4119158FDA68B12]]></AD_MESSAGE_ID>
 <!--9925F9856B92417CA4119158FDA68B12-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
--- a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
+++ b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
@@ -1211,7 +1211,7 @@
         filterWhereClause = '',
         valuesString = '',
         brandString = '',
-        i, j, forceRemote, doLocalIfRemoteFails;
+        i, j, forceRemote, doLocalIfRemoteFails = true;
 
     function errorCallback(tx, error) {
       OB.UTIL.showError("OBDAL error: " + error);
@@ -1559,13 +1559,16 @@
     }
 
     function errorCallbackProducts(tx, error) {
+      var message = error ? error.message : undefined;
       OB.UTIL.HookManager.executeHooks('OBPOS_PostFailureRemoteProductSearch', {
         tx: tx,
         error: error,
-        doLocal: doLocalIfRemoteFails
-      }, function () {
+        message: message,
+        doLocalIfRemoteFails: doLocalIfRemoteFails
+      }, function (args) {
         OB.UTIL.SynchronizationHelper.finished(synchIdSearchAction, 'searchAction');
-        if (!OB.MobileApp.model.hasPermission('OBPOS_remote.product', true) && doLocalIfRemoteFails) {
+        if (!error && !OB.MobileApp.model.hasPermission('OBPOS_remote.product', true) && doLocalIfRemoteFails) {
+          OB.UTIL.showError(OB.I18N.getLabel(args.message ? args.message : 'OBMOBC_RemoteConnectionFail'));
           me.doSearchAction({
             categoryTree: me.$.searchProductCharacteristicHeader.categoryTree,
             productCat: me.$.searchProductCharacteristicHeader.getSelectedCategories(),
@@ -1576,6 +1579,7 @@
             forceOffline: true
           });
         } else {
+          OB.UTIL.showError(OB.I18N.getLabel(args.message ? args.message : 'OBMOBC_ConnectionFail'));
           me.$.renderLoading.hide();
           me.$.products.collection.reset();
           me.$.products.show();
@@ -1586,7 +1590,6 @@
     if (!inEvent.skipProduct && OB.UI.SearchProductCharacteristic.prototype.forceRemote) {
       forceRemote = inEvent.forceOffline ? false : true;
       if (forceRemote) {
-        doLocalIfRemoteFails = true;
         this.customFilters.forEach(function (hqlFilter) {
           if (!_.isUndefined(hqlFilter.hqlCriteria) && !_.isUndefined(hqlFilter.forceRemote)) {
             var hqlCriteriaFilter = hqlFilter.hqlCriteria();

diff --git a/web/org.openbravo.retail.stockcriteria/js/hookPostFailureRemoteProductSearch.js b/web/org.openbravo.retail.stockcriteria/js/hookPostFailureRemoteProductSearch.js
--- a/web/org.openbravo.retail.stockcriteria/js/hookPostFailureRemoteProductSearch.js
+++ b/web/org.openbravo.retail.stockcriteria/js/hookPostFailureRemoteProductSearch.js
@@ -9,10 +9,10 @@
 
 (function () {
   OB.UTIL.HookManager.registerHook('OBPOS_PostFailureRemoteProductSearch', function (args, callbacks) {
-    if (args.doLocal) {
-      OB.UTIL.showError(OB.I18N.getLabel('OBRPSC_RemoteConnectionFail'));
-    } else {
-      OB.UTIL.showError(OB.I18N.getLabel('OBRPSC_OnlineRequiredForStock'));
+    if (!args.message && !args.doLocalIfRemoteFails) {
+      args.message = 'OBRPSC_OnlineRequiredForStock';
+    } else if (!args.message && !OB.MobileApp.model.hasPermission('OBPOS_remote.product', true) && !args.error) {
+      args.message = 'OBRPSC_RemoteConnectionFail';
     }
     OB.UTIL.HookManager.callbackExecutor(args, callbacks);
   });

diff --git a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
--- a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
+++ b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
@@ -1222,8 +1222,8 @@
     function postProccessFilters(index, dataProducts, queryWasExecutedOnline) {
       var filteredDataProducts;
       if (index < me.postProcessCustomFilters.length) {
-        me.postProcessCustomFilters[index].postProcess(dataProducts, function (queryWasExecutedOnline) {
-          postProccessFilters(++index, dataProducts);
+        me.postProcessCustomFilters[index].postProcess(dataProducts, function () {
+          postProccessFilters(++index, dataProducts, queryWasExecutedOnline);
         }, queryWasExecutedOnline);
       } else {
         if (_.pluck(me.customFilters, 'filterName').indexOf('ServicesFilter') === -1) {
@@ -1580,8 +1580,7 @@
         if (forceRemote) {
           me.customFilters.forEach(function (hqlFilter) {
             if (!_.isUndefined(hqlFilter.hqlCriteria) && !_.isUndefined(hqlFilter.forceRemote)) {
-              var hqlCriteriaFilter = hqlFilter.hqlCriteria();
-              hqlCriteriaFilter.forEach(function (filter) {
+              hqlFilter.hqlCriteria().forEach(function (filter) {
                 if (filter !== "" && hqlFilter.forceRemote) {
                   doLocalIfRemoteFails = false;
                 }
@@ -1589,14 +1588,14 @@
             }
           });
         }
-      } else {
+      } else if (!inEvent.skipProduct) {
         forceRemote = false;
         me.customFilters.forEach(function (hqlFilter) {
           if (!_.isUndefined(hqlFilter.hqlCriteria) && !_.isUndefined(hqlFilter.forceRemote)) {
-            var hqlCriteriaFilter = hqlFilter.hqlCriteria();
-            hqlCriteriaFilter.forEach(function (filter) {
-              if (filter !== "" && forceRemote === false) {
-                forceRemote = hqlFilter.forceRemote;
+            hqlFilter.hqlCriteria().forEach(function (filter) {
+              if (filter !== "" && !forceRemote && hqlFilter.forceRemote) {
+                forceRemote = true;
+                doLocalIfRemoteFails = false;
               }
             });
           }