diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-05-26 17:34:04 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-05-28 14:27:38 +0200 |
| commit | fe2b5f35a40ca8df662130608b0f89427a196362 (patch) | |
| tree | 0c7773f0599f3b1e6dbb869104fad0b04869b269 /addons/barcodes/static/src/js/barcode_parser.js | |
| parent | d4d8a2eae31e7a6a45029b84603e055300e3be36 (diff) | |
| parent | bf1e99964cdbc374f8a0c4cec1b338bf7c7c2930 (diff) | |
[MERGE] forward port of branch saas-6 up to bf1e999
Diffstat (limited to 'addons/barcodes/static/src/js/barcode_parser.js')
| -rw-r--r-- | addons/barcodes/static/src/js/barcode_parser.js | 9 |
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 e1703ae62b4..970019fb1f4 100644 --- a/addons/barcodes/static/src/js/barcode_parser.js +++ b/addons/barcodes/static/src/js/barcode_parser.js @@ -158,7 +158,14 @@ var BarcodeParser = Class.extend({ .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; }, |