diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js index 142d35bd340..08d1cf97d9b 100644 --- a/addons/point_of_sale/static/src/js/devices.js +++ b/addons/point_of_sale/static/src/js/devices.js @@ -196,7 +196,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 a2131f06960..1fbcfa77073 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -387,11 +387,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'); }, @@ -425,7 +425,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'), }; @@ -435,7 +435,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(), @@ -580,7 +580,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(); diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 47a527a010d..846ba2e3f19 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -186,8 +186,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 a34e405b101..2ccae2ba6be 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -74,7 +74,7 @@ - +
@@ -490,7 +490,7 @@ at - + / @@ -558,7 +558,7 @@ - +