0046075: Include missing patches for RTServer integration

diff --git a/src-db/database/sourcedata/AD_PREFERENCE.xml b/src-db/database/sourcedata/AD_PREFERENCE.xml
index 066056b24fb53c7bef5e80266a374fe12e3d7729..fcf391e8614180e0a2e79266ad308554c7fc319e 100644
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml
@@ -737,6 +737,17 @@
 <!--5769A60690944682BE78BC97AC4380EE-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
 <!--5769A60690944682BE78BC97AC4380EE--></AD_PREFERENCE>
 
+<!--5B5A5104256A4A66B86AE54947179BC2--><AD_PREFERENCE>
+<!--5B5A5104256A4A66B86AE54947179BC2-->  <AD_PREFERENCE_ID><![CDATA[5B5A5104256A4A66B86AE54947179BC2]]></AD_PREFERENCE_ID>
+<!--5B5A5104256A4A66B86AE54947179BC2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5B5A5104256A4A66B86AE54947179BC2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5B5A5104256A4A66B86AE54947179BC2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5B5A5104256A4A66B86AE54947179BC2-->  <VALUE><![CDATA[N]]></VALUE>
+<!--5B5A5104256A4A66B86AE54947179BC2-->  <PROPERTY><![CDATA[OBPOS_AvoidBlindAndVerifiedReturnInSameTicket]]></PROPERTY>
+<!--5B5A5104256A4A66B86AE54947179BC2-->  <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--5B5A5104256A4A66B86AE54947179BC2-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--5B5A5104256A4A66B86AE54947179BC2--></AD_PREFERENCE>
+
 <!--5E4BAD4D0583439F8AEBADBF9B1AC47B--><AD_PREFERENCE>
 <!--5E4BAD4D0583439F8AEBADBF9B1AC47B-->  <AD_PREFERENCE_ID><![CDATA[5E4BAD4D0583439F8AEBADBF9B1AC47B]]></AD_PREFERENCE_ID>
 <!--5E4BAD4D0583439F8AEBADBF9B1AC47B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
index e1b160a27e2381df6e7edc1b33875577ef3efe6b..d60ac4b62771e9fde33c6de662d3d0bf0eaaeb63 100644
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -78,6 +78,17 @@
 <!--05D1C7ECD15E4CA087D1A8113FEA20FB-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
 <!--05D1C7ECD15E4CA087D1A8113FEA20FB--></AD_REF_LIST>
 
+<!--05E5F18A7AA34A7A8E90DBC721047542--><AD_REF_LIST>
+<!--05E5F18A7AA34A7A8E90DBC721047542-->  <AD_REF_LIST_ID><![CDATA[05E5F18A7AA34A7A8E90DBC721047542]]></AD_REF_LIST_ID>
+<!--05E5F18A7AA34A7A8E90DBC721047542-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--05E5F18A7AA34A7A8E90DBC721047542-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--05E5F18A7AA34A7A8E90DBC721047542-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--05E5F18A7AA34A7A8E90DBC721047542-->  <VALUE><![CDATA[OBPOS_AvoidBlindAndVerifiedReturnInSameTicket]]></VALUE>
+<!--05E5F18A7AA34A7A8E90DBC721047542-->  <NAME><![CDATA[Web POS Avoid Blind and Verified Return Lines in same ticket]]></NAME>
+<!--05E5F18A7AA34A7A8E90DBC721047542-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--05E5F18A7AA34A7A8E90DBC721047542-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--05E5F18A7AA34A7A8E90DBC721047542--></AD_REF_LIST>
+
 <!--06B304ECFBEF440590FA8787FC6AF1F4--><AD_REF_LIST>
 <!--06B304ECFBEF440590FA8787FC6AF1F4-->  <AD_REF_LIST_ID><![CDATA[06B304ECFBEF440590FA8787FC6AF1F4]]></AD_REF_LIST_ID>
 <!--06B304ECFBEF440590FA8787FC6AF1F4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>

diff --git a/web/org.openbravo.retail.posterminal/js/actions/changequantity.js b/web/org.openbravo.retail.posterminal/js/actions/changequantity.js
index d46d1efd3854e6a213ea8db2d99a0921b68a4172..ef48df091226288bc3afd230099b3b7025245ce0 100644
--- a/web/org.openbravo.retail.posterminal/js/actions/changequantity.js
+++ b/web/org.openbravo.retail.posterminal/js/actions/changequantity.js
@@ -168,6 +168,10 @@
         return;
       }
 
+      if (receipt.validateAvoidBlindAndReturnLines(false)) {
+        return;
+      }
+
       validateQuantity()
         .then(
           function() {
diff --git a/web/org.openbravo.retail.posterminal/js/actions/returnline.js b/web/org.openbravo.retail.posterminal/js/actions/returnline.js
index 99ad74cc19cb2be3cb0900db8c90c6ac7975970f..4ae867d764916b2f58f721068532b8cee4c4a4dd 100644
--- a/web/org.openbravo.retail.posterminal/js/actions/returnline.js
+++ b/web/org.openbravo.retail.posterminal/js/actions/returnline.js
@@ -103,6 +103,10 @@
               view.waterfall('onRearrangedEditButtonBar');
               return;
             }
+            if (!receipt.validateAvoidBlindAndReturnLines(false)) {
+              view.waterfall('onRearrangedEditButtonBar');
+              return;
+            }
             receipt.set('undo', null);
             receipt.set('multipleUndo', true);
             receipt.set('preventServicesUpdate', true);
diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index c3ab043636cc12fe188971333854e22f22a74a8a..fb43752ae728665cc244323a9dfc27c1e849178f 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -3417,7 +3417,10 @@
               }
               attrs.cancelOperation = true;
             }
-            return null;
+            if (callback) {
+              callback(false);
+            }
+            return;
           }
           OB.UTIL.HookManager.executeHooks(
             'OBPOS_PostAddProductToOrder',
@@ -4829,6 +4832,15 @@
         ) {
           return;
         }
+
+        if (
+          !me.validateAvoidBlindAndReturnLines(
+            options.isVerifiedReturn || false
+          )
+        ) {
+          return;
+        }
+
         // Get prices from BP pricelist
         var newline = new OrderLine({
           id: OB.UTIL.get_UUID(),
@@ -5473,6 +5485,57 @@
       }
     },
 
+    validateAvoidBlindAndReturnLines: function(isVerifiedReturnLine) {
+      if (
+        !OB.MobileApp.model.hasPermission(
+          'OBPOS_AvoidBlindAndVerifiedReturnInSameTicket',
+          true
+        )
+      ) {
+        return true;
+      }
+
+      const totalLines = this.get('lines').length;
+      const negativeLines = _.filter(this.get('lines').models, function(line) {
+        return line.get('qty') < 0;
+      }).length;
+
+      if (negativeLines === 0 || negativeLines !== totalLines) {
+        return true;
+      }
+
+      const blindReturnLines = this.get('lines').models.filter(line => {
+        return !line.get('isVerifiedReturn');
+      });
+      const verifiedReturnLines = this.get('lines').models.filter(line => {
+        return line.get('isVerifiedReturn');
+      });
+
+      if (isVerifiedReturnLine) {
+        if (
+          blindReturnLines.length === 0 &&
+          verifiedReturnLines.length === totalLines
+        ) {
+          return true;
+        } else {
+          OB.UTIL.showWarning(
+            OB.I18N.getLabel('OBPOS_CannotAddVerifiedReturn')
+          );
+          return false;
+        }
+      } else {
+        if (
+          verifiedReturnLines.length === 0 &&
+          blindReturnLines.length === totalLines
+        ) {
+          return true;
+        } else {
+          OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_CannotAddBlindReturn'));
+          return false;
+        }
+      }
+    },
+
     validateAllowSalesWithReturn: function(qty, skipValidaton, selectedModels) {
       if (
         OB.MobileApp.model.hasPermission(

diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
index b12efbdd9c9f1243c8984dbcd1d2e1b9f194f5e5..8a3153b3f7f55864557b93bc64346ed01c07ed0d 100644
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -1525,6 +1525,18 @@
 <!--246E5926108E4417BD71771D0E036D5F-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--246E5926108E4417BD71771D0E036D5F--></AD_MESSAGE>
 
+<!--2473DF6742DA45598411F47B8B693005--><AD_MESSAGE>
+<!--2473DF6742DA45598411F47B8B693005-->  <AD_MESSAGE_ID><![CDATA[2473DF6742DA45598411F47B8B693005]]></AD_MESSAGE_ID>
+<!--2473DF6742DA45598411F47B8B693005-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2473DF6742DA45598411F47B8B693005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2473DF6742DA45598411F47B8B693005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2473DF6742DA45598411F47B8B693005-->  <VALUE><![CDATA[OBPOS_CannotAddBlindReturn]]></VALUE>
+<!--2473DF6742DA45598411F47B8B693005-->  <MSGTEXT><![CDATA[It is not possible to add blind return lines in a ticket with verified return lines.]]></MSGTEXT>
+<!--2473DF6742DA45598411F47B8B693005-->  <MSGTYPE><![CDATA[W]]></MSGTYPE>
+<!--2473DF6742DA45598411F47B8B693005-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--2473DF6742DA45598411F47B8B693005-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--2473DF6742DA45598411F47B8B693005--></AD_MESSAGE>
+
 <!--2526D690429D4D0B8CC879B799D9A611--><AD_MESSAGE>
 <!--2526D690429D4D0B8CC879B799D9A611-->  <AD_MESSAGE_ID><![CDATA[2526D690429D4D0B8CC879B799D9A611]]></AD_MESSAGE_ID>
 <!--2526D690429D4D0B8CC879B799D9A611-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8237,6 +8249,18 @@ Please contact your system administrator.]]></MSGTEXT>
 <!--A751DEDAF8FC45A2AF7D792FED1101F6-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--A751DEDAF8FC45A2AF7D792FED1101F6--></AD_MESSAGE>
 
+<!--A75444F6968A4FD88269B15B35B5A4D9--><AD_MESSAGE>
+<!--A75444F6968A4FD88269B15B35B5A4D9-->  <AD_MESSAGE_ID><![CDATA[A75444F6968A4FD88269B15B35B5A4D9]]></AD_MESSAGE_ID>
+<!--A75444F6968A4FD88269B15B35B5A4D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A75444F6968A4FD88269B15B35B5A4D9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A75444F6968A4FD88269B15B35B5A4D9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A75444F6968A4FD88269B15B35B5A4D9-->  <VALUE><![CDATA[OBPOS_CannotAddVerifiedReturn]]></VALUE>
+<!--A75444F6968A4FD88269B15B35B5A4D9-->  <MSGTEXT><![CDATA[It is not possible to add verified return lines in a ticket with blind return lines.]]></MSGTEXT>
+<!--A75444F6968A4FD88269B15B35B5A4D9-->  <MSGTYPE><![CDATA[W]]></MSGTYPE>
+<!--A75444F6968A4FD88269B15B35B5A4D9-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--A75444F6968A4FD88269B15B35B5A4D9-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--A75444F6968A4FD88269B15B35B5A4D9--></AD_MESSAGE>
+
 <!--A7CBAF28EE6C42A791DF740B61D77D4C--><AD_MESSAGE>
 <!--A7CBAF28EE6C42A791DF740B61D77D4C-->  <AD_MESSAGE_ID><![CDATA[A7CBAF28EE6C42A791DF740B61D77D4C]]></AD_MESSAGE_ID>
 <!--A7CBAF28EE6C42A791DF740B61D77D4C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index fb43752ae728665cc244323a9dfc27c1e849178f..3e3682ea54cfd3b05211ac4c0b838d6587960013 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -4835,7 +4835,7 @@
 
         if (
           !me.validateAvoidBlindAndReturnLines(
-            options.isVerifiedReturn || false
+            (options && options.isVerifiedReturn) || false
           )
         ) {
           return;