diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2013-07-12 14:34:55 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2013-07-12 14:34:55 +0200 |
| commit | 3c4455981105e4af72cedd8bca9a6abb76bb2ce1 (patch) | |
| tree | 459f16e7036652c9ef1999f74e53450a93eeef6a | |
| parent | a8ea08cf284fcc0aa2c2b6662348df1b69b4e698 (diff) | |
[IMP] point_of_sale: reduced the weighting probe interval, and put a non zero default value for easier testing
bzr revid: fva@openerp.com-20130712123455-whp86jp9qbmo6p0o
| -rw-r--r-- | addons/point_of_sale/controllers/main.py | 4 | ||||
| -rw-r--r-- | addons/point_of_sale/static/src/js/screens.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py index 9b8793bca21..db5d5a25018 100644 --- a/addons/point_of_sale/controllers/main.py +++ b/addons/point_of_sale/controllers/main.py @@ -104,7 +104,7 @@ class PointOfSaleController(http.Controller): @http.route('/pos/weighting_read_kg', type='json', auth='admin') def weighting_read_kg(self): print "weighting_read_kg" - return 0.0 + return 3.14 @http.route('/pos/weighting_end', type='json', auth='admin') def weighting_end(self): @@ -159,7 +159,7 @@ class PointOfSaleController(http.Controller): print 'print_receipt' + str(receipt) return - @http.route('/pos/print_receipt', type='json', auth='admin') + @http.route('/pos/print_pdf_invoice', type='json', auth='admin') def print_pdf_invoice(self, pdfinvoice): print 'print_pdf_invoice' + str(pdfinvoice) return diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 0ca814d82fb..e0a8ba4b71c 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -460,7 +460,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa clearInterval(this.intervalID); self.pos_widget.screen_selector.set_current_screen(self.next_screen); } - },500); + },100); this.add_action_button({ label: _t('Back'), @@ -515,7 +515,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa self.weight = weight; self.renderElement(); } - },200); + },100); }, renderElement: function(){ var self = this; |