summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorFrédéric van der Essen <fvdessen@gmail.com>2015-05-05 14:04:18 +0200
committerFrédéric van der Essen <fvdessen@gmail.com>2015-05-05 14:04:39 +0200
commit00236aafcc2a18f550d9eb6b4d6fcb926401470a (patch)
tree9ae108235cf49341152c738b2821f6777a9c72bd /addons
parent19161952cc15a561c3a569b7761931ed2c4684b8 (diff)
[FIX] point_of_sale: barcode patterns must match barcode as prefix, (and not anywhere in barcode)
Diffstat (limited to 'addons')
-rw-r--r--addons/barcodes/static/src/js/barcode_parser.js9
1 files changed, 8 insertions, 1 deletions
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;
},