0045288: MultiUPC module doesn't work correctly when scanning if many products are available in local mode

diff --git a/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js b/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js
index 2cd9da5365fa89e2ad8ea1327ac58a9f58ba8bc3..d0b8d8d021f4b3c753e1e7120d3ebd7c6c1f11e7 100644
--- a/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js
+++ b/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js
@@ -55,7 +55,7 @@
       var me = this;
       async function successCallbackMultiUPC(d) {
         if (d && d.length > 0) {
-          if (OB.MobileApp.model.hasPermission('OBPOS_remote.product', true)) {
+          if (OB.UTIL.remoteSearch(OB.Model.Product)) {
             let criteria = {};
             var m_product_id = {
               columns: ['id'],
@@ -91,7 +91,7 @@
         me.successCallbackProducts(data, code, callback, attrs);
       } else {
         let upcCriteria = {};
-        if (OB.MobileApp.model.hasPermission('OBPOS_remote.product', true)) {
+        if (OB.UTIL.remoteSearch(OB.Model.Product)) {
           var upcCode = {
             columns: ['upc'],
             operator: 'equals',
@@ -100,15 +100,11 @@
           var remoteCriteria = [upcCode];
           upcCriteria.remoteFilters = remoteCriteria;
 
-          OB.Dal.findUsingCache(
-            'multiupcSearch',
+          OB.Dal.find(
             OB.Model.MultiUPC,
             upcCriteria,
             successCallbackMultiUPC,
-            me.errorCallback,
-            {
-              modelsAffectedByCache: ['MultiUPC']
-            }
+            me.errorCallback
           );
         } else {
           upcCriteria = new OB.App.Class.Criteria()
diff --git a/web/org.openbravo.retail.multiupc/js/multiupc.js b/web/org.openbravo.retail.multiupc/js/multiupc.js
index 830b6f25dab209db00231a0e51516c90d3b76352..b20a84ca0018f9111431ae4d58043f12fc2b61ee 100644
--- a/web/org.openbravo.retail.multiupc/js/multiupc.js
+++ b/web/org.openbravo.retail.multiupc/js/multiupc.js
@@ -17,7 +17,8 @@
     dataLimit: 300,
     paginationById: true,
     includeTerminalDate: true,
-    legacyModel: true
+    legacyModel: true,
+    equivalentModel: 'Product'
   });
 
   MultiUPC.addProperties([

diff --git a/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js b/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js
index d0b8d8d021f4b3c753e1e7120d3ebd7c6c1f11e7..d306c228dc4a47707bd119a7a10c2f9942de2041 100644
--- a/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js
+++ b/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js
@@ -55,7 +55,7 @@
       var me = this;
       async function successCallbackMultiUPC(d) {
         if (d && d.length > 0) {
-          if (OB.UTIL.remoteSearch(OB.Model.Product)) {
+          if (OB.MobileApp.model.hasPermission('OBPOS_remote.product', true)) {
             let criteria = {};
             var m_product_id = {
               columns: ['id'],

diff --git a/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js b/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js
index d306c228dc4a47707bd119a7a10c2f9942de2041..09bfece2694c628c6bbf43a5e12c845d57da6440 100644
--- a/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js
+++ b/web/org.openbravo.retail.multiupc/js/extendUPCSearch.js
@@ -74,8 +74,14 @@
             );
           } else {
             try {
+              var m_product_id;
+              if (d.at) {
+                m_product_id = d.at(0).get('m_product_id');
+              } else {
+                m_product_id = d[0].get('id');
+              }
               const products = await OB.App.MasterdataModels.Product.withId(
-                d[0].get('id')
+                m_product_id
               );
               data.push(OB.Dal.transform(OB.Model.Product, products));
               me.successCallbackProducts(data, code, callback, attrs);