diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-05-13 14:08:51 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-05-13 14:08:51 +0200 |
| commit | 7f2a9e77b6dbe65e3977f8a3b15de1785bc5d7d3 (patch) | |
| tree | 9a6232b1dcf1f0435b1332c126a8d9cfdc683e64 /addons/barcodes/static/src/js | |
| parent | 89873cbed5fb31547843a7a135145d46986431af (diff) | |
| parent | dcab356b38aad5d6c7940c0211a3a940a8be9a65 (diff) | |
[MERGE] forward port of branch 9.0 up to dcab356
Diffstat (limited to 'addons/barcodes/static/src/js')
| -rw-r--r-- | addons/barcodes/static/src/js/inherited_form_widget_button.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/barcodes/static/src/js/inherited_form_widget_button.js b/addons/barcodes/static/src/js/inherited_form_widget_button.js index bf2ea1bbd35..79cf6deb823 100644 --- a/addons/barcodes/static/src/js/inherited_form_widget_button.js +++ b/addons/barcodes/static/src/js/inherited_form_widget_button.js @@ -15,7 +15,8 @@ var ButtonBarcodeHandlerMixin = _.extend({}, BarcodeHandlerMixin, { var self = this; this.on_barcode_scanned = function(barcode) { var match = barcode.match(/O-BTN\.(.+)/); - if (match && match[1] === self.node.attrs.barcode_trigger && self.$el.is(':visible')) { + if (match && match[1] === self.node.attrs.barcode_trigger && + (self.$el.is(':visible') || self.$el.parent('.dropdown-menu'))) { self.on_click(); } }; |