diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-05-13 15:58:06 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-05-13 15:58:06 +0200 |
| commit | c4bba868f0493134b69cb22c3ee0d896d4b38048 (patch) | |
| tree | 547a13e863feb7a63fafd3e8e0a92918f435697b /addons/barcodes/static/src/js/inherited_form_widget_button.js | |
| parent | 43f40ec4035eee1c76ceb37dd359397869c473b5 (diff) | |
| parent | 087729f31b626b32c98bd3048bf7b63c1de73d38 (diff) | |
[MERGE] forward port of branch saas-9 up to 087729f
Diffstat (limited to 'addons/barcodes/static/src/js/inherited_form_widget_button.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(); } }; |