From 00a28c4b3d9a4e5ec2af6ad229a56d74a3030937 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 5 Nov 2012 16:13:57 +0530 Subject: [PATCH] [IMP]pos does not calculate tax and touch screen does not gives actually quantity bzr revid: sgo@tinyerp.com-20121105104357-6r59u4g20ojg0hlw --- addons/point_of_sale/static/src/js/models.js | 2 +- addons/point_of_sale/static/src/js/widgets.js | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 360f88b715b..d7d6d3181f1 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -465,7 +465,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal var product_list = this.pos.get('product_list'); var product = this.get_product(); - var taxes_ids = product.taxes_id; + var taxes_ids = product.get('taxes_id');; var taxes = self.pos.get('taxes'); var taxtotal = 0; _.each(taxes_ids, function(el) { diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 28ab79c65b2..ed9b1fd060a 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -202,12 +202,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.currentOrderLines.bind('remove', this.renderElement, this); }, update_numpad: function() { - var reset = false; - if (this.selected_line !== this.pos.get('selectedOrder').getSelectedLine()) { - reset = true; - } this.selected_line = this.pos.get('selectedOrder').getSelectedLine(); - if (reset && this.numpadState) + if (this.numpadState) this.numpadState.reset(); }, renderElement: function() {