0022434: Arbitrary discounts needs two permissions to work

diff -r bb09005ab60a web/org.openbravo.retail.posterminal/js/components/keyboard.js
--- a/web/org.openbravo.retail.posterminal/js/components/keyboard.js	Wed Dec 05 11:07:15 2012 +0100
+++ b/web/org.openbravo.retail.posterminal/js/components/keyboard.js	Thu Dec 06 10:40:21 2012 +0100
@@ -191,6 +191,60 @@
               }]
             }]
           }, {
+            // right toolbar for ticket discounts
+            tag: 'div',
+            name: 'ticketDiscountsToolbar',
+            components: [{
+              tag: 'div',
+              classes: 'row-fluid',
+              components: [{
+                tag: 'div',
+                classes: 'span6',
+                components: [{
+                  kind: 'OB.UI.ButtonKey'
+                }]
+              }, {
+                tag: 'div',
+                classes: 'span6',
+                components: [{
+                  kind: 'OB.UI.ButtonKey'
+                }]
+              }]
+            }, {
+              tag: 'div',
+              classes: 'row-fluid',
+              components: [{
+                tag: 'div',
+                classes: 'span12',
+                components: [{
+                  kind: 'OB.UI.ButtonKey'
+                }]
+              }]
+            }, {
+              tag: 'div',
+              classes: 'row-fluid',
+              components: [{
+                tag: 'div',
+                classes: 'span12',
+                components: [{
+                  kind: 'OB.UI.ButtonKey'
+                }]
+              }]
+            }, {
+              tag: 'div',
+              classes: 'row-fluid',
+              components: [{
+                tag: 'div',
+                classes: 'span12',
+                components: [{
+                  kind: 'OB.UI.ButtonKey',
+                  label: OB.I18N.getLabel('OBPOS_KbDiscount'),
+                  permission: 'OBPOS_retail.advDiscounts',
+                  command: 'ticket:discount'
+                }]
+              }]
+            }]
+          }, {
             tag: 'div',
             classes: 'row-fluid',
             components: [{
@@ -476,7 +530,9 @@
     if (this.sideBarEnabled) {
       this.$.sideenabled.show();
       this.$.sidedisabled.hide();
+      this.$.ticketDiscountsToolbar.hide();
     } else {
+      this.$.ticketDiscountsToolbar.hide();
       this.$.sideenabled.hide();
       this.$.sidedisabled.show();
     }
@@ -608,6 +664,7 @@
   showSidepad: function (sidepadname) {
     this.$.sideenabled.hide();
     this.$.sidedisabled.hide();
+    this.$.ticketDiscountsToolbar.hide();
     this.$[sidepadname].show();
   }
 });
diff -r bb09005ab60a web/org.openbravo.retail.posterminal/js/components/menu.js
--- a/web/org.openbravo.retail.posterminal/js/components/menu.js	Wed Dec 05 11:07:15 2012 +0100
+++ b/web/org.openbravo.retail.posterminal/js/components/menu.js	Thu Dec 06 10:40:21 2012 +0100
@@ -222,7 +222,6 @@
   name: 'OB.UI.MenuDiscounts',
   kind: 'OB.UI.MenuAction',
   permission: 'OBPOS_retail.advDiscounts',
-  relatedPermission: 'OBPOS_order.discount',
   events: {
     onDiscountsMode: ''
   },
@@ -246,7 +245,7 @@
     this.receipt = model.get('order');
     //set disabled until ticket has lines
     me.setDisabled(true);
-    if (!OB.POS.modelterminal.hasPermission(this.permission) || !OB.POS.modelterminal.hasPermission(this.relatedPermission)) {
+    if (!OB.POS.modelterminal.hasPermission(this.permission)) {
       //no permissions, never will be enabled
       return;
     }
diff -r bb09005ab60a web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboardorder.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboardorder.js	Wed Dec 05 11:07:15 2012 +0100
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboardorder.js	Thu Dec 06 10:40:21 2012 +0100
@@ -27,11 +27,16 @@
     onKeyboardOnDiscountsMode: 'keyboardOnDiscountsMode'
   },
   keyboardOnDiscountsMode: function (inSender, inEvent) {
+    if (inEvent.status) {
+      this.showSidepad('ticketDiscountsToolbar');
+    } else {
+      this.showSidepad('sideenabled');
+    }
     if (!inEvent.status) {
       //exit from discounts
       this.discountsMode = false;
-      if (this.buttons['line:dto']) {
-        this.buttons['line:dto'].removeClass('btnactive');
+      if (this.buttons['ticket:discount']) {
+        this.buttons['ticket:discount'].removeClass('btnactive');
       }
 
       this.keyboardDisabled(inSender, {
@@ -44,45 +49,13 @@
         this.keyboardDisabled(inSender, {
           status: false
         });
-        //disable commands except line:dto
-        if (this.buttons['+']) {
-          this.buttons['+'].setDisabled(inEvent.status);
-        }
-
-        if (this.buttons['-']) {
-          this.buttons['-'].setDisabled(inEvent.status);
-        }
-
-        if (this.buttons['line:price']) {
-          this.buttons['line:price'].setDisabled(inEvent.status);
-        }
-        if (this.buttons['line:qty']) {
-          this.buttons['line:qty'].setDisabled(inEvent.status);
-        }
-
-        //css
-        if (this.buttons['+']) {
-          this.buttons['+'].addClass('btnkeyboard-inactive');
-        }
-
-        if (this.buttons['-']) {
-          this.buttons['-'].addClass('btnkeyboard-inactive');
-        }
-
-        if (this.buttons['line:price']) {
-          this.buttons['line:price'].addClass('btnkeyboard-inactive');
-        }
-        if (this.buttons['line:qty']) {
-          this.buttons['line:qty'].addClass('btnkeyboard-inactive');
-        }
-
         //button as active
-        if (this.buttons['line:dto']) {
-          this.buttons['line:dto'].addClass('btnactive');
+        if (this.buttons['ticket:discount']) {
+          this.buttons['ticket:discount'].addClass('btnactive');
         }
       } else {
-        if (this.buttons['line:dto']) {
-          this.buttons['line:dto'].removeClass('btnactive');
+        if (this.buttons['ticket:discount']) {
+          this.buttons['ticket:discount'].removeClass('btnactive');
         }
 
         this.keyboardDisabled(inSender, {
@@ -196,6 +169,20 @@
         }
       }
     });
+
+    //To be used in the discounts side bar
+    this.addCommand('ticket:discount', {
+      permission: 'OBPOS_retail.advDiscounts',
+      action: function (keyboard, txt) {
+        if (keyboard.discountsMode) {
+          me.doSetDiscountQty({
+            qty: OB.I18N.parseNumber(txt)
+          });
+          return true;
+        }
+      }
+    });
+
     this.addCommand('code', new OB.UI.BarcodeActionHandler());
     this.addCommand('+', {
       stateless: true,