0047458: Return with multiprice list product

From ec5a9127155504d01e878d4d4d04561ba80c07c3 Mon Sep 17 00:00:00 2001
From: Prakash M <prakash@qualiantech.com>
Date: Tue, 3 Aug 2021 16:00:25 +0530
Subject: [PATCH] Fixed ISSUE-47458: Added Incremental criteria for Assortment
 in ProductPrice Query

---
 src/org/openbravo/retail/posterminal/master/ProductPrice.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/openbravo/retail/posterminal/master/ProductPrice.java b/src/org/openbravo/retail/posterminal/master/ProductPrice.java
index da222a8a3..5aeb04560 100644
--- a/src/org/openbravo/retail/posterminal/master/ProductPrice.java
+++ b/src/org/openbravo/retail/posterminal/master/ProductPrice.java
@@ -131,7 +131,7 @@ public class ProductPrice extends MasterDataProcessHQLQuery {
           + " and $hqlCriteria "//
           + " and pli.$naturalOrgCriteria" //
           + " and pli.$readableClientCriteria" //
-          + " and (ppp.$incrementalUpdateCriteria) " //
+          + " and (pli.$incrementalUpdateCriteria or ppp.$incrementalUpdateCriteria) " //
           + " and ppp.$paginationByIdCriteria" //
           + " order by ppp.id asc");
 
-- 
2.20.1

diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
index 50232a8c9..4c1c61b69 100644
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -6729,7 +6729,7 @@ Please contact your system administrator.]]></MSGTEXT>
 <!--7B8CC33B52CD47A6B511DCF6CF00EC02-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7B8CC33B52CD47A6B511DCF6CF00EC02-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7B8CC33B52CD47A6B511DCF6CF00EC02-->  <VALUE><![CDATA[OBPOS_ProductNotFoundInPriceList]]></VALUE>
-<!--7B8CC33B52CD47A6B511DCF6CF00EC02-->  <MSGTEXT><![CDATA[Selected product not found in customer price list]]></MSGTEXT>
+<!--7B8CC33B52CD47A6B511DCF6CF00EC02-->  <MSGTEXT><![CDATA[Selected product '%0' not found in customer price list]]></MSGTEXT>
 <!--7B8CC33B52CD47A6B511DCF6CF00EC02-->  <MSGTYPE><![CDATA[W]]></MSGTYPE>
 <!--7B8CC33B52CD47A6B511DCF6CF00EC02-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
 <!--7B8CC33B52CD47A6B511DCF6CF00EC02-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
diff --git a/web-test/model/business-object/ticket/actions/AddProduct-actionPreparation.test.js b/web-test/model/business-object/ticket/actions/AddProduct-actionPreparation.test.js
index 0d90b0928..a8c758958 100644
--- a/web-test/model/business-object/ticket/actions/AddProduct-actionPreparation.test.js
+++ b/web-test/model/business-object/ticket/actions/AddProduct-actionPreparation.test.js
@@ -1450,7 +1450,9 @@ describe('addProduct preparation', () => {
             products: [{ product: crossStoreProduct, qty: 1 }]
           }),
         {
-          warningMsg: 'OBPOS_ProductNotFoundInPriceList'
+          warningMsg: 'OBPOS_ProductNotFoundInPriceList',
+          // eslint-disable-next-line no-underscore-dangle
+          messageParams: [crossStoreProduct._identifier]
         }
       );
     });
@@ -1504,7 +1506,9 @@ describe('addProduct preparation', () => {
             ticket
           ),
         {
-          warningMsg: 'OBPOS_ProductNotFoundInPriceList'
+          warningMsg: 'OBPOS_ProductNotFoundInPriceList',
+          // eslint-disable-next-line no-underscore-dangle
+          messageParams: [Product.productA._identifier]
         }
       );
     });
@@ -1526,7 +1530,9 @@ describe('addProduct preparation', () => {
             ticket
           ),
         {
-          warningMsg: 'OBPOS_ProductNotFoundInPriceList'
+          warningMsg: 'OBPOS_ProductNotFoundInPriceList',
+          // eslint-disable-next-line no-underscore-dangle
+          messageParams: [Product.productA._identifier]
         }
       );
     });
diff --git a/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/AddProduct.js b/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/AddProduct.js
index a6791f62b..92ad236db 100644
--- a/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/AddProduct.js
+++ b/web/org.openbravo.retail.posterminal/app/model/business-object/ticket/actions/AddProduct.js
@@ -986,12 +986,16 @@
         productPrice = await getProductPrice(ticket, pi);
       } catch (error) {
         throw new OB.App.Class.ActionCanceled({
-          warningMsg: 'OBPOS_ProductNotFoundInPriceList'
+          warningMsg: 'OBPOS_ProductNotFoundInPriceList',
+          // eslint-disable-next-line no-underscore-dangle
+          messageParams: [pi.product._identifier]
         });
       }
       if (!productPrice) {
         throw new OB.App.Class.ActionCanceled({
-          warningMsg: 'OBPOS_ProductNotFoundInPriceList'
+          warningMsg: 'OBPOS_ProductNotFoundInPriceList',
+          // eslint-disable-next-line no-underscore-dangle
+          messageParams: [pi.product._identifier]
         });
       }
       result.product = { ...result.product, ...productPrice };
diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index 06a2e7662..93bd086db 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -2951,7 +2951,9 @@
             }
           });
         } else {
-          OB.UTIL.showI18NWarning('OBPOS_ProductNotFoundInPriceList');
+          OB.UTIL.showWarning('OBPOS_ProductNotFoundInPriceList', [
+            p.get('_identifier')
+          ]);
           OB.UTIL.ProcessController.finish('addProduct', execution);
           if (callback) {
             callback(false, null);
@@ -2960,7 +2962,9 @@
       }
 
       function errorCallback() {
-        OB.UTIL.showI18NWarning('OBPOS_ProductNotFoundInPriceList');
+        OB.UTIL.showWarning('OBPOS_ProductNotFoundInPriceList', [
+          p.get('_identifier')
+        ]);
         OB.UTIL.ProcessController.finish('addProduct', execution);
         if (callback) {
           callback(false, null);
@@ -3003,14 +3007,18 @@
             }
           });
           if (OB.UTIL.isNullOrUndefined(p.get('standardPrice'))) {
-            OB.UTIL.showI18NWarning('OBPOS_ProductNotFoundInPriceList');
+            OB.UTIL.showWarning('OBPOS_ProductNotFoundInPriceList', [
+              p.get('_identifier')
+            ]);
             OB.UTIL.ProcessController.finish('addProduct', execution);
             if (callback) {
               callback(false, null);
             }
           }
         } else {
-          OB.UTIL.showI18NWarning('OBPOS_ProductNotFoundInPriceList');
+          OB.UTIL.showWarning('OBPOS_ProductNotFoundInPriceList', [
+            p.get('_identifier')
+          ]);
           OB.UTIL.ProcessController.finish('addProduct', execution);
           if (callback) {
             callback(false, null);

diff --git a/web/org.openbravo.retail.returns/js/returnUtils.js b/web/org.openbravo.retail.returns/js/returnUtils.js
index 24df99a..82d5ddf 100644
--- a/web/org.openbravo.retail.returns/js/returnUtils.js
+++ b/web/org.openbravo.retail.returns/js/returnUtils.js
@@ -23,6 +23,9 @@
       OB.UTIL.isNullOrUndefined(returnLines) ||
       (_.isArray(returnLines) && returnLines.length === 0)
     ) {
+      if (callback) {
+        callback();
+      }
       return;
     }
 
@@ -34,6 +37,9 @@
           OB.I18N.getLabel('OBMOBC_LblWarning'),
           OB.I18N.getLabel('OBRETUR_ReturnCashVATLinesNoMixWithoutCashVATOnes')
         );
+        if (callback) {
+          callback();
+        }
         return;
       }
     }
@@ -49,6 +55,7 @@
       servicesToApproveArr = [],
       overdueServicesToApprove = '',
       overdueServicesToApproveArr = [],
+      finalCallback,
       execution;
 
     currentDate.setHours(0);
@@ -56,6 +63,15 @@
     currentDate.setSeconds(0);
     currentDate.setMilliseconds(0);
 
+    finalCallback = function() {
+      if (execution) {
+        OB.UTIL.ProcessController.finish('addReturnLines', execution);
+      }
+      if (callback) {
+        callback();
+      }
+    };
+
     createOrderLine = async function(index) {
       if (index === 0) {
         execution = OB.UTIL.ProcessController.start('addReturnLines');
@@ -69,10 +85,7 @@
             receipt: receipt
           },
           function(args) {
-            OB.UTIL.ProcessController.finish('addReturnLines', execution);
-            if (callback) {
-              callback();
-            }
+            finalCallback();
           }
         );
         return;
@@ -144,6 +157,9 @@
                 line,
                 function() {
                   createOrderLine(index + 1);
+                },
+                function() {
+                  finalCallback();
                 }
               );
             }
@@ -191,6 +207,7 @@
                     ]
                   );
                 }
+                finalCallback();
               }
             };
             if (OB.App.Security.hasPermission('OBPOS_remote.product')) {
@@ -200,7 +217,9 @@
                 function(product) {
                   createLineFunction(product);
                 },
-                null,
+                function() {
+                  finalCallback();
+                },
                 callLoadedProduct
               );
             } else {
@@ -209,6 +228,7 @@
           }
         } catch (err) {
           OB.error(err.message);
+          finalCallback();
         }
       } else {
         createOrderLine(index + 1);
@@ -274,6 +294,8 @@
             }
             ignoreReturnApproval = true;
             createOrderLine(0);
+          } else {
+            finalCallback();
           }
         }
       );