pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] fix 'in' expression when reading a price or weight barcode

Browse Source 
bzr revid: rlo@openerp.com-20120329102548-gnffz8am3m755agq
This commit is contained in:
Roberto López López (OpenERP)
2012-03-29 12:25:48 +02:00
parent d9c673d586
commit 646e0334c8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/js/pos.js
+2 -2
View File
@@ -1328,14 +1328,14 @@ openerp.point_of_sale = function(db) {
}
});
}
if (barcode.substring(0,2) in ['02', '22', '24', '26', '28']) {
if (barcode.substring(0,2) in {'02':'', '22':'', '24':'', '26':'', '28':''}) {
// 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']) {
} else if (barcode.substring(0,2) in {'21':'','23':'','27':'','29':'','25':''}) {
// product sold by weight
barcode = barcode.substring(2,5);
weight = Number(barcode.substring(7,5))/1000;