summaryrefslogtreecommitdiff
path: root/addons/barcodes/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-02-01 17:02:19 +0100
committerChristophe Simonis <chs@odoo.com>2018-02-01 17:02:19 +0100
commitf5e7b866860436782ade53308da1ff725be1f124 (patch)
tree7de955d50bde762431b8a2383649d61578a40178 /addons/barcodes/static/src
parent942b9d1a3c3eaf3c7c676681d614a091b307240f (diff)
parent920aa6174c938bbfc0864a95ff3d8ebbe3132387 (diff)
[MERGE] forward port branch saas-16 up to 920aa6174c9
Diffstat (limited to 'addons/barcodes/static/src')
-rw-r--r--addons/barcodes/static/src/js/barcode_events.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/barcodes/static/src/js/barcode_events.js b/addons/barcodes/static/src/js/barcode_events.js
index f26748ac7b3..e02d3aafdb7 100644
--- a/addons/barcodes/static/src/js/barcode_events.js
+++ b/addons/barcodes/static/src/js/barcode_events.js
@@ -3,6 +3,7 @@ odoo.define('barcodes.BarcodeEvents', function(require) {
var core = require('web.core');
var mixins = require('web.mixins');
+var session = require('web.session');
// For IE >= 9, use this, new CustomEvent(), instead of new Event()
@@ -26,7 +27,7 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, {
suffix: /[\n\r\t]+/,
// Keys from a barcode scanner are usually processed as quick as possible,
// but some scanners can use an intercharacter delay (we support <= 50 ms)
- max_time_between_keys_in_ms: 55,
+ max_time_between_keys_in_ms: session.max_time_between_keys_in_ms || 55,
init: function() {
mixins.PropertiesMixin.init.call(this);