diff options
| author | Martin Trigaux <mat@odoo.com> | 2016-03-22 14:28:48 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2016-03-22 14:30:21 +0100 |
| commit | b54b8883058cb33b066421127885c8a8b29617c4 (patch) | |
| tree | 13070e0f85a77722d8279ac81877d7adc393e8f1 /addons/barcodes/static/src/js/form_view_barcode_handler.js | |
| parent | f5c5223a105cfca1ad732307014bf29f9ac1b715 (diff) | |
| parent | 87578177ac4bc19c1fd7fb1155e3793fb5866d66 (diff) | |
[MERGE] Forwardport of branch 9.0 up to revision 87578177
Diffstat (limited to 'addons/barcodes/static/src/js/form_view_barcode_handler.js')
| -rw-r--r-- | addons/barcodes/static/src/js/form_view_barcode_handler.js | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/addons/barcodes/static/src/js/form_view_barcode_handler.js b/addons/barcodes/static/src/js/form_view_barcode_handler.js index 572913c1b54..a6fa4b55adf 100644 --- a/addons/barcodes/static/src/js/form_view_barcode_handler.js +++ b/addons/barcodes/static/src/js/form_view_barcode_handler.js @@ -64,30 +64,33 @@ var FormViewBarcodeHandler = common.AbstractField.extend(BarcodeHandlerMixin, { var self = this; var character = String.fromCharCode(event.which); - if (this.form_view.get('actual_mode') === 'view') { - this._display_no_edit_mode_warning(); - } else if ($(event.target).is('body') && /[0-9]/.test(character)) { // only catch the event if we're not focused in - // another field and it's a number - var field = this.form_view.fields[this.m2x_field]; - var view = field.viewmanager.active_view; - - if (this.last_scanned_barcode) { - var new_qty = window.prompt(_t('Set quantity'), character) || "0"; - new_qty = new_qty.replace(',', '.'); - var record = this._get_records(field).find(function(record) { - return record.get('product_barcode') === self.last_scanned_barcode; - }); - if (record) { - var values = {}; - values[this.quantity_field] = parseFloat(new_qty); - field.data_update(record.get('id'), values).then(function () { - view.controller.reload_record(record); + // only catch the event if we're not focused in + // another field and it's a number + if ($(event.target).is('body') && /[0-9]/.test(character)) { + if (this.form_view.get('actual_mode') === 'view') { + this._display_no_edit_mode_warning(); + } else { + var field = this.form_view.fields[this.m2x_field]; + var view = field.viewmanager.active_view; + + if (this.last_scanned_barcode) { + var new_qty = window.prompt(_t('Set quantity'), character) || "0"; + new_qty = new_qty.replace(',', '.'); + var record = this._get_records(field).find(function(record) { + return record.get('product_barcode') === self.last_scanned_barcode; }); + if (record) { + var values = {}; + values[this.quantity_field] = parseFloat(new_qty); + field.data_update(record.get('id'), values).then(function () { + view.controller.reload_record(record); + }); + } else { + this._display_no_last_scanned_warning(); + } } else { this._display_no_last_scanned_warning(); } - } else { - this._display_no_last_scanned_warning(); } } }, |