From 00236aafcc2a18f550d9eb6b4d6fcb926401470a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Tue, 5 May 2015 14:04:18 +0200 Subject: [PATCH] [FIX] point_of_sale: barcode patterns must match barcode as prefix, (and not anywhere in barcode) --- addons/barcodes/static/src/js/barcode_parser.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/barcodes/static/src/js/barcode_parser.js b/addons/barcodes/static/src/js/barcode_parser.js index f7dcd96c201..55bedf95c38 100644 --- a/addons/barcodes/static/src/js/barcode_parser.js +++ b/addons/barcodes/static/src/js/barcode_parser.js @@ -155,7 +155,14 @@ openerp.barcodes = function(instance) { match['base_code'] = match['base_code'].replace("\\\\", "\\").replace("\{", "{").replace("\}","}").replace("\.","."); } - match['match'] = match['base_code'].substr(0,base_pattern.length).match(base_pattern); + if (base_pattern[0] !== '^') { + base_pattern = "^" + base_pattern; + } + if (base_pattern[base_pattern.length -1] !== '$') { + base_pattern = base_pattern + ".*$"; + } + match.match = match.base_code.match(base_pattern); + return match; },