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

[MERGE] some more point_of_sale fixes 

bzr revid: fva@openerp.com-20120903133534-lmfxxlj0zmx8hcvy
This commit is contained in:
Frédéric van der Essen 2012-09-03 15:35:34 +02:00
parent fab8fe4f26 2c3b3a0bd1
commit d66b22bd26
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,6 +184,8 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
* price_with_tax: (number) the price paid for this orderline, tax included
* price_without_tax: (number) the price paid for this orderline, without taxes
* tax: (number) the price paid in taxes on this orderline
* product_description: (string) generic description of the product
* product_description_sale: (string) sales related information of the product
* }
* - paymentlines : list of paymentlines :
* {

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

@ -142,7 +142,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
return fetch(
'product.product',
['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type'],
['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13',
'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
[['pos_categ_id','!=', false],['sale_ok','=',true]],
{pricelist: self.get('shop').pricelist_id[0]} // context for price
);
@ -417,6 +418,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
price_with_tax : this.get_price_with_tax(),
price_without_tax: this.get_price_without_tax(),
tax: this.get_tax(),
product_description: this.get_product().get('description'),
product_description_sale: this.get_product().get('description_sale'),
};
},
get_price_without_tax: function(){