0025226: RMP29: Receipt discount wrongly applied to Return receipt

diff --git a/web/org.openbravo.retail.returns/js/modalReturnLines.js b/web/org.openbravo.retail.returns/js/modalReturnLines.js
--- a/web/org.openbravo.retail.returns/js/modalReturnLines.js
+++ b/web/org.openbravo.retail.returns/js/modalReturnLines.js
@@ -330,7 +330,9 @@
               'originalOrderLineId': line.lineId,
               'originalDocumentNo': me.args.args.order.documentNo,
               'skipApplyPromotions': true,
-              'promotions': line.promotions
+              'promotions': line.promotions,
+              // this line is checked as not selectable to avoid that a discretionary discount is applied in it
+              'notSelectableLine': true
             });
             me.args.args.context.model.get('order').calculateGross();
             me.args.args.context.model.get('order').save();

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
@@ -408,6 +408,18 @@
 <!--63FBD2F2CB2A4FAA8B967841C721A0D5-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--63FBD2F2CB2A4FAA8B967841C721A0D5--></AD_MESSAGE>
 
+<!--6AA507E5724E46878297166894CBB6DD--><AD_MESSAGE>
+<!--6AA507E5724E46878297166894CBB6DD-->  <AD_MESSAGE_ID><![CDATA[6AA507E5724E46878297166894CBB6DD]]></AD_MESSAGE_ID>
+<!--6AA507E5724E46878297166894CBB6DD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6AA507E5724E46878297166894CBB6DD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6AA507E5724E46878297166894CBB6DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6AA507E5724E46878297166894CBB6DD-->  <VALUE><![CDATA[OBMOBC_LineCanNotBeSelected]]></VALUE>
+<!--6AA507E5724E46878297166894CBB6DD-->  <MSGTEXT><![CDATA[Line cannot be selected]]></MSGTEXT>
+<!--6AA507E5724E46878297166894CBB6DD-->  <MSGTYPE><![CDATA[W]]></MSGTYPE>
+<!--6AA507E5724E46878297166894CBB6DD-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--6AA507E5724E46878297166894CBB6DD-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--6AA507E5724E46878297166894CBB6DD--></AD_MESSAGE>
+
 <!--81062F7B27454D8D8DA9FD022B3024D4--><AD_MESSAGE>
 <!--81062F7B27454D8D8DA9FD022B3024D4-->  <AD_MESSAGE_ID><![CDATA[81062F7B27454D8D8DA9FD022B3024D4]]></AD_MESSAGE_ID>
 <!--81062F7B27454D8D8DA9FD022B3024D4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.mobile.core/source/component/ob-scrollabletable.js b/web/org.openbravo.mobile.core/source/component/ob-scrollabletable.js
--- a/web/org.openbravo.mobile.core/source/component/ob-scrollabletable.js
+++ b/web/org.openbravo.mobile.core/source/component/ob-scrollabletable.js
@@ -43,7 +43,7 @@
   getLineByValue: function (arg, value) {
     //Automated test
     return _.find(this.$.tbody.children, function (line) {
-      if (line.children[0].getValue && line.children[0].getValue(arg) === value){
+      if (line.children[0].getValue && line.children[0].getValue(arg) === value) {
         return line.children[0];
       }
     });
@@ -343,6 +343,12 @@
     }, this);
 
     model.on('check', function () {
+      // this line can not be selected
+      if (model.has('notSelectableLine') && model.get('notSelectableLine')) {
+        OB.UTIL.showWarning(OB.I18N.getLabel('OBMOBC_LineCanNotBeSelected'));
+        return;
+      }
+
       if (this.listStyle === 'checkboxlist') {
         var components = tr.getComponents(),
             allChecked = null,