diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js index 782aac8c101..55e75ebcf42 100644 --- a/addons/point_of_sale/static/src/js/devices.js +++ b/addons/point_of_sale/static/src/js/devices.js @@ -202,7 +202,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal * { * quantity: (number) the number of items, or the weight, * unit_name: (string) the name of the item's unit (kg, dozen, ...) - * list_price: (number) the price of one unit of the item before discount + * price: (number) the price of one unit of the item before discount * discount: (number) the discount on the product in % [0,100] * product_name: (string) the name of the product * price_with_tax: (number) the price paid for this orderline, tax included diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 3adbd19b161..f533fa760ab 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -342,7 +342,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal this.pos = options.pos; this.order = options.order; this.product = options.product; - this.price = options.product.get('list_price'); + this.price = options.product.get('price'); this.quantity = 1; this.discount = 0; this.type = 'unit'; @@ -396,11 +396,11 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal return this.product; }, // return the base price of this product (for this orderline) - get_list_price: function(){ + get_price: function(){ return this.price; }, // changes the base price of the product for this orderline - set_list_price: function(price){ + set_price: function(price){ this.price = price; this.trigger('change'); }, @@ -434,7 +434,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal export_as_JSON: function() { return { qty: this.get_quantity(), - price_unit: this.get_list_price(), + price_unit: this.get_price(), discount: this.get_discount(), product_id: this.get_product().get('id'), }; @@ -444,7 +444,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal return { quantity: this.get_quantity(), unit_name: this.get_unit().name, - list_price: this.get_list_price(), + price: this.get_price(), discount: this.get_discount(), product_name: this.get_product().get('name'), price_with_tax : this.get_price_with_tax(), @@ -589,7 +589,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal line.set_quantity(options.quantity); } if(options.price !== undefined){ - line.set_list_price(options.price); + line.set_price(options.price); } var last_orderline = this.getLastOrderline(); @@ -625,7 +625,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal }, getDiscountTotal: function() { return (this.get('orderLines')).reduce((function(sum, orderLine) { - return sum + (orderLine.get_list_price() * (orderLine.get_discount()/100) * orderLine.get_quantity()); + return sum + (orderLine.get_price() * (orderLine.get_discount()/100) * orderLine.get_quantity()); }), 0); }, getTotalTaxExcluded: function() { diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 87c541aea81..dd7f55efc37 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -535,7 +535,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }, get_product_price: function(){ var product = this.get_product(); - return (product ? product.get('list_price') : 0) || 0; + return (product ? product.get('price') : 0) || 0; }, get_product_weight: function(){ return this.weight || 0; diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 0d7a6cacff2..135c00f198d 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -184,8 +184,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa order.getSelectedLine().set_quantity(val); }else if( mode === 'discount'){ order.getSelectedLine().set_discount(val); - }else if( mode === 'list_price'){ - order.getSelectedLine().set_list_price(val); + }else if( mode === 'price'){ + order.getSelectedLine().set_price(val); } } else { this.pos.get('selectedOrder').destroy(); diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 85397c4686a..33935b85d12 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -85,7 +85,7 @@ - +
@@ -387,12 +387,12 @@ - + - + @@ -510,7 +510,7 @@ at - + / @@ -584,7 +584,7 @@ - +