0040440: Discounts Category Enhancement - Multi selection will be kept in discounts window

diff --git a/src-db/database/sourcedata/AD_PREFERENCE.xml b/src-db/database/sourcedata/AD_PREFERENCE.xml
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml
@@ -1001,6 +1001,17 @@
 <!--858811874F5648AF9D7266961A3CE0A5-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
 <!--858811874F5648AF9D7266961A3CE0A5--></AD_PREFERENCE>
 
+<!--86D38CC13F8F4A6D8C6F3694AA0858C0--><AD_PREFERENCE>
+<!--86D38CC13F8F4A6D8C6F3694AA0858C0-->  <AD_PREFERENCE_ID><![CDATA[86D38CC13F8F4A6D8C6F3694AA0858C0]]></AD_PREFERENCE_ID>
+<!--86D38CC13F8F4A6D8C6F3694AA0858C0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--86D38CC13F8F4A6D8C6F3694AA0858C0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--86D38CC13F8F4A6D8C6F3694AA0858C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--86D38CC13F8F4A6D8C6F3694AA0858C0-->  <VALUE><![CDATA[N]]></VALUE>
+<!--86D38CC13F8F4A6D8C6F3694AA0858C0-->  <PROPERTY><![CDATA[OBPOS_AutoSelectDiscounts]]></PROPERTY>
+<!--86D38CC13F8F4A6D8C6F3694AA0858C0-->  <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--86D38CC13F8F4A6D8C6F3694AA0858C0-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--86D38CC13F8F4A6D8C6F3694AA0858C0--></AD_PREFERENCE>
+
 <!--86D9FA1641464B0DB09CE966CB6F2835--><AD_PREFERENCE>
 <!--86D9FA1641464B0DB09CE966CB6F2835-->  <AD_PREFERENCE_ID><![CDATA[86D9FA1641464B0DB09CE966CB6F2835]]></AD_PREFERENCE_ID>
 <!--86D9FA1641464B0DB09CE966CB6F2835-->  <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
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -1380,6 +1380,18 @@
 <!--781A00A4F3F84A34BB745EC246A9554B-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
 <!--781A00A4F3F84A34BB745EC246A9554B--></AD_REF_LIST>
 
+<!--789414A77D8A4D13ABE5ABB3C6D4CBFB--><AD_REF_LIST>
+<!--789414A77D8A4D13ABE5ABB3C6D4CBFB-->  <AD_REF_LIST_ID><![CDATA[789414A77D8A4D13ABE5ABB3C6D4CBFB]]></AD_REF_LIST_ID>
+<!--789414A77D8A4D13ABE5ABB3C6D4CBFB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--789414A77D8A4D13ABE5ABB3C6D4CBFB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--789414A77D8A4D13ABE5ABB3C6D4CBFB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--789414A77D8A4D13ABE5ABB3C6D4CBFB-->  <VALUE><![CDATA[OBPOS_AutoSelectDiscounts]]></VALUE>
+<!--789414A77D8A4D13ABE5ABB3C6D4CBFB-->  <NAME><![CDATA[WebPOS Check Discounts if Lines are Selected]]></NAME>
+<!--789414A77D8A4D13ABE5ABB3C6D4CBFB-->  <DESCRIPTION><![CDATA[WebPOS Check Discounts if Lines are Selected]]></DESCRIPTION>
+<!--789414A77D8A4D13ABE5ABB3C6D4CBFB-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--789414A77D8A4D13ABE5ABB3C6D4CBFB-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--789414A77D8A4D13ABE5ABB3C6D4CBFB--></AD_REF_LIST>
+
 <!--7B216FE08B8D456B9F979F883D780D98--><AD_REF_LIST>
 <!--7B216FE08B8D456B9F979F883D780D98-->  <AD_REF_LIST_ID><![CDATA[7B216FE08B8D456B9F979F883D780D98]]></AD_REF_LIST_ID>
 <!--7B216FE08B8D456B9F979F883D780D98-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/ticketdiscount.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/ticketdiscount.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/ticketdiscount.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/ticketdiscount.js
@@ -147,9 +147,17 @@
       };
       promos.sort();
       me.discounts.reset(promos.models);
-      me.ticketLineChecked({}, {
-        checkedLines: me.checkedLines
-      });
+      if (OB.MobileApp.model.hasPermission('OBPOS_AutoSelectDiscounts', true)) {
+          var selectedModels = OB.MobileApp.view.$.containerWindow.getRoot().$.multiColumn.$.rightPanel.$.keyboard.selectedModels,
+               i;
+           for (i = 0; i < selectedModels.length; i++) {
+             selectedModels[i].trigger('check');
+           }
+       } else {
+           me.ticketLineChecked({}, {
+             checkedLines: me.checkedLines
+           });
+        }
       //set the keyboard for selected discount
       if (promos.length > 0) {
         var model = promos.at(0);
@@ -187,9 +195,17 @@
         }
       });
       tr.render();
-      me.ticketLineChecked({}, {
-        checkedLines: me.checkedLines
-      });
+      if (OB.MobileApp.model.hasPermission('OBPOS_AutoSelectDiscounts', true)) {
+          var selectedModels = OB.MobileApp.view.$.containerWindow.getRoot().$.multiColumn.$.rightPanel.$.keyboard.selectedModels,
+               i;
+           for (i = 0; i < selectedModels.length; i++) {
+             selectedModels[i].trigger('check');
+           }
+       } else {
+           me.ticketLineChecked({}, {
+             checkedLines: me.checkedLines
+           });
+        }
     });
     this.inherited(arguments);
   },

diff --git a/web/org.openbravo.retail.discounts.category/js/discountsButton.js b/web/org.openbravo.retail.discounts.category/js/discountsButton.js
--- a/web/org.openbravo.retail.discounts.category/js/discountsButton.js
+++ b/web/org.openbravo.retail.discounts.category/js/discountsButton.js
@@ -82,6 +82,11 @@
     this.doCheckAllTicketLines({
       status: false
     });
+    var selectedModels = OB.MobileApp.view.$.containerWindow.getRoot().$.multiColumn.$.rightPanel.$.keyboard.selectedModels,
+        i;
+    for (i = 0; i < selectedModels.length; i++) {
+      selectedModels[i].trigger('check');
+    }
     this.inherited(arguments);
   },
   ticketLineChecked: function (inSender, inEvent) {