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

[imp] currency conversion - yet incomplete 

bzr revid: rlo@openerp.com-20120327141422-9grv8dw70q89ayx5
This commit is contained in:
Roberto López López (OpenERP) 2012-03-27 16:14:22 +02:00
parent b6fa154cbc
commit e515089023
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/point_of_sale/__openerp__.py
View File

@ -40,7 +40,7 @@ Main features :
""",
'author': 'OpenERP SA',
'images': ['images/cash_registers.jpeg', 'images/pos_analysis.jpeg','images/register_analysis.jpeg','images/sale_order_pos.jpeg','images/product_pos.jpeg'],
'depends': ['sale'],
'depends': ['sale','account'],
'init_xml': [],
'update_xml': [

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

@ -1249,6 +1249,7 @@ openerp.point_of_sale = function(db) {
id = 0;
}
c = pos.categories[id];
currency = pos.get('currency');
this.categoryView.ancestors = c.ancestors;
this.categoryView.children = c.children;
this.categoryView.renderElement();
@ -1307,6 +1308,7 @@ openerp.point_of_sale = function(db) {
// product with a specific price - specified into the barcode
barcode = barcode.substring(2,5);
// TODO conversion euro - old local currencies
new db.web.Model('res.currency').get_func('_get_conversion_rate')(['FRF', 'EUR']).pipe(function(result){});
price = Number(barcode.substring(7,5))/100;
weight = '';
} else if (barcode.substring(0,2) in ['21','23','27','29','25']) {