0025503: Cash management window: when there are more than 6 payment methods set as deposit or withdrawal, only 6 buttons are shown

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>
 
+<!--7DF82A98667E4F73B7ECD92C7F6D2020--><AD_MESSAGE>
+<!--7DF82A98667E4F73B7ECD92C7F6D2020-->  <AD_MESSAGE_ID><![CDATA[7DF82A98667E4F73B7ECD92C7F6D2020]]></AD_MESSAGE_ID>
+<!--7DF82A98667E4F73B7ECD92C7F6D2020-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7DF82A98667E4F73B7ECD92C7F6D2020-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7DF82A98667E4F73B7ECD92C7F6D2020-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7DF82A98667E4F73B7ECD92C7F6D2020-->  <VALUE><![CDATA[OBMOBC_MoreButtons]]></VALUE>
+<!--7DF82A98667E4F73B7ECD92C7F6D2020-->  <MSGTEXT><![CDATA[More actions]]></MSGTEXT>
+<!--7DF82A98667E4F73B7ECD92C7F6D2020-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--7DF82A98667E4F73B7ECD92C7F6D2020-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--7DF82A98667E4F73B7ECD92C7F6D2020-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--7DF82A98667E4F73B7ECD92C7F6D2020--></AD_MESSAGE>
+
 <!--81062F7B27454D8D8DA9FD022B3024D4--><AD_MESSAGE>
 <!--81062F7B27454D8D8DA9FD022B3024D4-->  <AD_MESSAGE_ID><![CDATA[81062F7B27454D8D8DA9FD022B3024D4]]></AD_MESSAGE_ID>
 <!--81062F7B27454D8D8DA9FD022B3024D4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -600,6 +612,18 @@
 <!--BB31C5F8D9474134843A5D123636B0AD-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--BB31C5F8D9474134843A5D123636B0AD--></AD_MESSAGE>
 
+<!--C3310CCE0E214501BA270C41CA35CFB3--><AD_MESSAGE>
+<!--C3310CCE0E214501BA270C41CA35CFB3-->  <AD_MESSAGE_ID><![CDATA[C3310CCE0E214501BA270C41CA35CFB3]]></AD_MESSAGE_ID>
+<!--C3310CCE0E214501BA270C41CA35CFB3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C3310CCE0E214501BA270C41CA35CFB3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C3310CCE0E214501BA270C41CA35CFB3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C3310CCE0E214501BA270C41CA35CFB3-->  <VALUE><![CDATA[OBMOBC_More]]></VALUE>
+<!--C3310CCE0E214501BA270C41CA35CFB3-->  <MSGTEXT><![CDATA[More...]]></MSGTEXT>
+<!--C3310CCE0E214501BA270C41CA35CFB3-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--C3310CCE0E214501BA270C41CA35CFB3-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--C3310CCE0E214501BA270C41CA35CFB3-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--C3310CCE0E214501BA270C41CA35CFB3--></AD_MESSAGE>
+
 <!--C4315A1B9B0746C38F56D74B56C2386B--><AD_MESSAGE>
 <!--C4315A1B9B0746C38F56D74B56C2386B-->  <AD_MESSAGE_ID><![CDATA[C4315A1B9B0746C38F56D74B56C2386B]]></AD_MESSAGE_ID>
 <!--C4315A1B9B0746C38F56D74B56C2386B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.mobile.core/source/component/ob-keyboard.js b/web/org.openbravo.mobile.core/source/component/ob-keyboard.js
--- a/web/org.openbravo.mobile.core/source/component/ob-keyboard.js
+++ b/web/org.openbravo.mobile.core/source/component/ob-keyboard.js
@@ -13,6 +13,7 @@
   name: 'OB.UI.Keyboard',
   commands: {},
   buttons: {},
+  maxButtons: 6,
   status: '',
   sideBarEnabled: false,
   destroy: function () {
@@ -23,6 +24,9 @@
   keyMatcher: /^([0-9]|\.|,| |%|[a-z]|[A-Z])$/,
   classes: 'row-fluid',
   components: [{
+    kind: 'OB.UI.MoreButtons',
+    name: 'OB_UI_MoreButtons'
+  }, {
     name: 'toolbarcontainer',
     classes: 'span3'
   }, {
@@ -495,7 +499,7 @@
         }
       } else if (txt && this.status !== '') {
         this.execCommand(this.status, txt);
-        if (this.buttons[this.status] && !this.buttons[this.status].owner.holdActive) {
+        if (this.commands[this.status] && !this.commands[this.status].holdActive) {
           this.setStatus('');
         }
       }
@@ -516,7 +520,7 @@
           this.setStatus(cmd);
         }
       }
-      if (this.buttons[cmd] && this.buttons[cmd].owner.holdActive) {
+      if (this.commands[cmd].holdActive) {
         this.doHoldActiveCmd({
           cmd: cmd
         });
@@ -633,25 +637,46 @@
       kind: 'OB.UI.BtnSide',
       btn: {}
     },
-        i = 0;
+        i = 0,
+        hasMore = newToolbar.buttons.length > this.maxButtons,
+        displayedButtons = hasMore ? this.maxButtons - 1 : newToolbar.buttons.length,
+        displayedEmptyButtons = hasMore ? 0 : this.maxButtons - newToolbar.buttons.length,
+        btnDef, dialogButtons = {};
 
-    enyo.forEach(newToolbar.buttons, function (btnDef) {
-      if (btnDef.command) {
-        toolbar.createComponent({
-          kind: 'OB.UI.BtnSide',
-          btn: btnDef
-        });
+    for (i = 0; i < newToolbar.buttons.length; i++) {
+      btnDef = newToolbar.buttons[i];
+      if (i < displayedButtons) {
+        // Send button to toolbar
+        if (btnDef.command) {
+          toolbar.createComponent({
+            kind: 'OB.UI.BtnSide',
+            btn: btnDef
+          });
+        } else {
+          toolbar.createComponent(emptyBtn);
+        }
       } else {
-        toolbar.createComponent(emptyBtn);
+        // Send button to dialog.
+        dialogButtons[btnDef.command] = btnDef;
       }
-      i++;
-    }, this);
+    }
 
+    if (hasMore) {
+      // Add the button More..
+      toolbar.createComponent({
+        name: 'btnMore',
+        keyboard: this,
+        dialogButtons: dialogButtons,
+        kind: 'OB.UI.ToolbarMore'
+      });
+    }
 
-    // populate toolbar up to 6 empty buttons
-    for (; i < 6; i++) {
+    // populate toolbar up to maxButtons with empty buttons
+    for (i = 0; i < displayedEmptyButtons; i++) {
       toolbar.createComponent(emptyBtn);
     }
+     //A toolbar could be create async, so we will hide it after creation.
+     toolbar.hide();
   },
 
   addToolbarComponent: function (newToolbar) {
@@ -768,8 +793,7 @@
       command: this.btn.command,
       permission: this.btn.permission,
       definition: this.btn.definition,
-      classButtonActive: this.btn.classButtonActive || 'btnactive-green',
-      holdActive: this.btn.holdActive
+      classButtonActive: this.btn.classButtonActive || 'btnactive-green'
     });
   }
 });
@@ -794,4 +818,94 @@
       me.addProductToReceipt(keyboard, product);
     }, keyboard);
   }
-});
\ No newline at end of file
+});
+
+enyo.kind({
+  name: 'OB.UI.ToolbarMore',
+  style: 'display:table; width:100%;',
+  handlers: {
+    onStatusChanged: 'statusChanged'
+  },
+  components: [{
+    style: 'margin: 5px;',
+    components: [{
+      kind: 'OB.UI.Button',
+      classes: 'btnkeyboard',
+      name: 'btn',
+      label: ''
+    }]
+  }],
+  initComponents: function () {
+    this.inherited(arguments);
+    this.$.btn.setContent(OB.I18N.getLabel('OBMOBC_More'));
+    this.activegreen = false;
+  },
+  tap: function () {
+    if (this.activegreen) {
+      this.keyboard.setStatus('');
+    } else {
+      this.keyboard.$.OB_UI_MoreButtons.showMoreButtons(this.dialogButtons);
+    }
+  },
+  statusChanged: function (inSender, inEvent) {
+    var status = inEvent.status;
+
+    // Hide the More actions dialog if visible.
+    if (this.keyboard.$.OB_UI_MoreButtons.hasNode()) {
+      this.keyboard.$.OB_UI_MoreButtons.hide();
+    }
+
+    if (this.activegreen) {
+      this.$.btn.setContent(OB.I18N.getLabel('OBMOBC_More'));
+      this.$.btn.removeClass('btnactive-green');
+      this.activegreen = false;
+    }
+
+    if (this.dialogButtons[status]) {
+      this.$.btn.setContent(this.dialogButtons[status].label);
+      this.$.btn.addClass('btnactive-green');
+      this.activegreen = true;
+    }
+  }
+});
+
+enyo.kind({
+  name: 'OB.UI.MoreButtons',
+  kind: 'OB.UI.Modal',
+  topPosition: '125px',
+  i18nHeader: 'OBMOBC_MoreButtons',
+  sideButtons: [],
+  body: {
+    classes: 'row-fluid',
+    components: [{
+      classes: 'span12',
+      components: [{
+        style: 'border-bottom: 1px solid #cccccc;',
+        classes: 'row-fluid',
+        components: [{
+          name: 'morebuttonslist',
+          classes: 'span12'
+        }]
+      }]
+    }]
+  },
+  showMoreButtons: function (dialogButtons) {
+
+    // Destroy previous buttons
+    this.$.body.$.morebuttonslist.destroyComponents();
+
+    // Create the new buttons.
+    _.each(dialogButtons, function (btnDef) {
+      this.$.body.$.morebuttonslist.createComponent({
+        kind: 'OB.UI.BtnSide',
+        btn: btnDef
+      });
+    }, this);
+
+    // Render the new components created
+    this.$.body.$.morebuttonslist.render();
+
+    // Finally show the dialog.
+    this.show();
+  }
+});

diff --git a/web/org.openbravo.retail.posterminal/js/closecash/view/closekeyboard.js b/web/org.openbravo.retail.posterminal/js/closecash/view/closekeyboard.js
--- a/web/org.openbravo.retail.posterminal/js/closecash/view/closekeyboard.js
+++ b/web/org.openbravo.retail.posterminal/js/closecash/view/closekeyboard.js
@@ -29,12 +29,12 @@
       buttons: [{
         command: 'allowvariableamount',
         definition: {
+          holdActive: true,
           action: function (keyboard, amt) {
             me.model.set('otherInput', OB.I18N.parseNumber(amt));
           }
         },
-        label: OB.I18N.getLabel('OBPOS_LblOther'),
-        holdActive: true
+        label: OB.I18N.getLabel('OBPOS_LblOther')
       }]
     });