diff --git a/addons/barcodes/models/ir_http.py b/addons/barcodes/models/ir_http.py index 7877033ad8..4f7c16419b 100644 --- a/addons/barcodes/models/ir_http.py +++ b/addons/barcodes/models/ir_http.py @@ -11,5 +11,5 @@ class IrHttp(models.AbstractModel): res = super(IrHttp, self).session_info() if self.env.user.has_group('base.group_user'): res['max_time_between_keys_in_ms'] = int( - self.env['ir.config_parameter'].sudo().get_param('barcode.max_time_between_keys_in_ms', default='55')) + self.env['ir.config_parameter'].sudo().get_param('barcode.max_time_between_keys_in_ms', default='100')) return res diff --git a/addons/barcodes/static/src/js/barcode_events.js b/addons/barcodes/static/src/js/barcode_events.js index 11c39280f8..a71281761c 100644 --- a/addons/barcodes/static/src/js/barcode_events.js +++ b/addons/barcodes/static/src/js/barcode_events.js @@ -28,7 +28,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: session.max_time_between_keys_in_ms || 55, + max_time_between_keys_in_ms: session.max_time_between_keys_in_ms || 100, // To be able to receive the barcode value, an input must be focused. // On mobile devices, this causes the virtual keyboard to open. // Unfortunately it is not possible to avoid this behavior... diff --git a/addons/l10n_in/views/report_invoice.xml b/addons/l10n_in/views/report_invoice.xml index 009dc5fe1b..ef8a2e44f9 100644 --- a/addons/l10n_in/views/report_invoice.xml +++ b/addons/l10n_in/views/report_invoice.xml @@ -41,7 +41,7 @@

- + Draft Cancelled Credit Note diff --git a/addons/purchase_stock/models/product.py b/addons/purchase_stock/models/product.py index 76a162803e..afc5e1c775 100644 --- a/addons/purchase_stock/models/product.py +++ b/addons/purchase_stock/models/product.py @@ -11,10 +11,9 @@ class ProductTemplate(models.Model): @api.model def _get_buy_route(self): - buy_route_id = self.env.ref('purchase_stock.route_warehouse0_buy', raise_if_not_found=False).id - buy_route = self.env['stock.location.route'].search([('id', '=', buy_route_id)]) + buy_route = self.env.ref('purchase_stock.route_warehouse0_buy', raise_if_not_found=False) if buy_route: - return buy_route.ids + return self.env['stock.location.route'].search([('id', '=', buy_route.id)]).ids return [] route_ids = fields.Many2many(default=lambda self: self._get_buy_route()) diff --git a/addons/website/static/src/js/menu/seo.js b/addons/website/static/src/js/menu/seo.js index 720fa44f4e..4aded570e2 100644 --- a/addons/website/static/src/js/menu/seo.js +++ b/addons/website/static/src/js/menu/seo.js @@ -227,11 +227,11 @@ var HtmlPage = Class.extend(mixins.PropertiesMixin, { return window.location.origin + window.location.pathname; }, title: function () { - return $('title').text().trim(); + return $('head title').text().trim(); }, changeTitle: function (title) { // TODO create tag if missing - $('title').text(title.trim() || this.defaultTitle); + $('head title').text(title.trim() || this.defaultTitle); this.trigger('title-changed', title); }, description: function () {