[MERGE] forward port branch saas-11.4 up to d54a3726eca

2 files changed, 3 insertions, 1 deletions

diff --git a/addons/barcodes/static/src/js/barcode_events.js b/addons/barcodes/static/src/js/barcode_events.js
index 9f2863dfdfd..2d602a36b97 100644
--- a/addons/barcodes/static/src/js/barcode_events.js
+++ b/addons/barcodes/static/src/js/barcode_events.js
@@ -65,7 +65,6 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, {
                     'top': '50%',
                     'transform': 'translateY(-50%)',
                     'z-index': '-1',
-                    'visibility': 'hidden',
                 },
             });
             // Avoid to show autocomplete for a non appearing input
diff --git a/addons/barcodes/static/src/js/barcode_parser.js b/addons/barcodes/static/src/js/barcode_parser.js
index d834f3cbd27..cf357a438b2 100644
--- a/addons/barcodes/static/src/js/barcode_parser.js
+++ b/addons/barcodes/static/src/js/barcode_parser.js
@@ -18,6 +18,9 @@ var BarcodeParser = Class.extend({
     // only when those data have been loaded
     load: function(){
         var self = this;
+        if (!this.nomenclature_id) {
+            return;
+        }
         var id = this.nomenclature_id[0];
         rpc.query({
                 model: 'barcode.nomenclature',