0034169: the kind of buttons added to keypad is replaced in toolbarbutton array

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
@@ -976,15 +976,12 @@
     }
   },
   initComponents: function () {
-    this.createComponent({
-      kind: 'OB.UI.ButtonKey',
-      name: this.btn.command,
-      label: this.btn.i18nLabel ? OB.I18N.getLabel(this.btn.i18nLabel) : this.btn.label,
-      command: this.btn.command,
-      permission: this.btn.permission,
-      definition: this.btn.definition,
-      classButtonActive: this.btn.classButtonActive || 'btnactive-green'
-    });
+	  var componentObj=this.btn;
+	  componentObj.kind=this.btn.kind?this.btn.kind:'OB.UI.ButtonKey';
+	  componentObj.label= this.btn.i18nLabel ? OB.I18N.getLabel(this.btn.i18nLabel) : this.btn.label;
+	  componentObj.classButtonActive= this.btn.classButtonActive || 'btnactive-green';
+	  
+    this.createComponent(componentObj);
   }
 });
 
diff --git a/web/org.openbravo.mobile.core/source/component/ob-keypadbasic.js b/web/org.openbravo.mobile.core/source/component/ob-keypadbasic.js
--- a/web/org.openbravo.mobile.core/source/component/ob-keypadbasic.js
+++ b/web/org.openbravo.mobile.core/source/component/ob-keypadbasic.js
@@ -258,5 +258,8 @@
       this.$.button.setDisabled(true);
       this.$.button.addClass(this.classButtonDisabled);
     }
+  },
+  init: function (model) {
+    this.model = model;
   }
 });
\ No newline at end of file