From 63df74b8dcde40b9752868f92c3e6e9ad9343543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 5 Sep 2012 22:20:58 +0200 Subject: [PATCH] [FIX] keyboard layout and numpad input bzr revid: fva@openerp.com-20120905202058-o5r2ckzhwdkv2xhq --- .../point_of_sale/static/src/css/keyboard.css | 24 +++++++++---------- addons/point_of_sale/static/src/js/screens.js | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/addons/point_of_sale/static/src/css/keyboard.css b/addons/point_of_sale/static/src/css/keyboard.css index 3a06970929f..d5ce468d7be 100644 --- a/addons/point_of_sale/static/src/css/keyboard.css +++ b/addons/point_of_sale/static/src/css/keyboard.css @@ -71,7 +71,7 @@ clear: left; } .point-of-sale .keyboard .lastitem { - margin-right: 0; + margin-right: 0 !important; } /* ---- full sized keyboard ---- */ @@ -79,13 +79,13 @@ .point-of-sale .full_keyboard { list-style: none; font-size: 14px; - width: 680px; + width: 685px; height: 100%; - margin-left: auto; - margin-right: auto; + margin-left: auto !important; + margin-right: auto !important; } .point-of-sale .full_keyboard li{ - margin: 0 5px 5px 0; + margin: 0 5px 5px 0 !important; width: 40px; height: 40px; line-height: 40px; @@ -115,22 +115,22 @@ .point-of-sale .simple_keyboard { list-style: none; font-size: 16px; - width: 545px; + width: 555px; height: 220px; - margin-left: auto; - margin-right: auto; + margin-left: auto !important; + margin-right: auto !important; } .point-of-sale .simple_keyboard li{ - margin: 0 5px 5px 0; + margin: 0 5px 5px 0 !important; width: 49px; height: 49px; line-height: 49px; } .point-of-sale .simple_keyboard .firstitem.row_asdf{ - margin-left:25px; + margin-left:25px !important; } .point-of-sale .simple_keyboard .firstitem.row_zxcv{ - margin-left:55px; + margin-left:55px !important; } .point-of-sale .simple_keyboard .delete{ width: 103px; @@ -139,7 +139,7 @@ width: 103px; } .point-of-sale .simple_keyboard .space{ - width:268px; + width:273px; } .point-of-sale .simple_keyboard .numlock{ width:103px; diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 6dcce2f75f9..9873f848f0a 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -787,6 +787,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }); this.updatePaymentSummary(); + this.$('.paymentline-amout input').last().focus(); }, close: function(){ this._super(); @@ -874,7 +875,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa this.numpadState.set({mode: 'payment'}); }, set_value: function(val) { - this.currentPaymentLines.last().set({amount: val}); + this.currentPaymentLines.last().set_amount(val); }, });