[MERGE] forward port branch 9.0 up to 8376f538b56

2 files changed, 5 insertions, 0 deletions

diff --git a/addons/barcodes/static/src/js/barcode_events.js b/addons/barcodes/static/src/js/barcode_events.js
index 3c5cb289232..0adff5f8e1b 100644
--- a/addons/barcodes/static/src/js/barcode_events.js
+++ b/addons/barcodes/static/src/js/barcode_events.js
@@ -113,6 +113,7 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, {
         if (e.key === "ArrowLeft" || e.key === "ArrowRight" ||
             e.key === "ArrowUp" || e.key === "ArrowDown" ||
             e.key === "Escape" || e.key === "Tab" ||
+            e.key === "Backspace" || e.key === "Delete" ||
             /F\d\d?/.test(e.key)) {
             return true;
         } else {
diff --git a/addons/barcodes/static/src/js/field_float_scannable.js b/addons/barcodes/static/src/js/field_float_scannable.js
index 79022362251..801cf32b5e2 100644
--- a/addons/barcodes/static/src/js/field_float_scannable.js
+++ b/addons/barcodes/static/src/js/field_float_scannable.js
@@ -23,6 +23,10 @@ var FieldFloatScannable = form_widgets.FieldFloat.extend({
     },
 
     simulateKeypress: function (e) {
+        /* only simulate a keypress if it has been previously prevented */
+        if (e.originalEvent.dispatched_by_barcode_reader !== true) {
+            return;
+        }
         var character = String.fromCharCode(e.which);
         var current_str = e.target.value;
         var str_before_carret = current_str.substring(0, e.target.selectionStart);