From 8f8e6967d1780736f9bc6b5c3d58c02c72f18cdd Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 8 Oct 2012 18:27:09 +0530 Subject: [PATCH] [IMP]pos product can not consider pricelist price it only consider list price of product. make it work on price of product of given pricelist bzr revid: sgo@tinyerp.com-20121008125709-rxfptf69lyaj0p3a --- addons/point_of_sale/static/src/js/models.js | 2 +- addons/point_of_sale/static/src/js/screens.js | 2 +- addons/point_of_sale/static/src/xml/pos.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 2c6f4e8b6e0..a2131f06960 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -333,7 +333,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'; diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 1ad03c5ead1..1b8a224c7c8 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -530,7 +530,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/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 854dd61cc1b..a34e405b101 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -368,12 +368,12 @@ - + - +