odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] fix POS 

bzr revid: fp@openerp.com-20121105204051-g1kx1uf7ur2bj8ke
This commit is contained in:
Fabien Pinckaers 2012-11-05 21:40:51 +01:00
parent fa3c7f11c0 00a28c4b3d
commit 6db4620bce
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/point_of_sale/static/src/js/models.js
View File

@ -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) {

6
addons/point_of_sale/static/src/js/widgets.js
View File

@ -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() {