diff --git a/assets/src/js/functions/numbers.js b/assets/src/js/functions/numbers.js
index e0def09c1..5f1ffac52 100644
--- a/assets/src/js/functions/numbers.js
+++ b/assets/src/js/functions/numbers.js
@@ -1,13 +1,19 @@
 function initNumbers() {
-    $('.decimal-number').not('.bound').each(function () {
-        let $this = $(this);
+    let inputs = $('.decimal-number').not('.bound');
 
-        let min = $this.attr('min-value') && $this.attr('min-value') !== "undefined" ? $this.attr('min-value') : null;
-        let max = $this.attr('max-value') && $this.attr('max-value') !== "undefined" ? $this.attr('max-value') : null;
+    for (const input of inputs) {
+        let $input = $(input);
 
-        let decimals = $this.attr('decimals') ? $this.attr('decimals') : globals.cifre_decimali;
+        if (AutoNumeric.isManagedByAutoNumeric(input)) {
+            continue;
+        }
 
-        let autonumeric = new AutoNumeric(this, {
+        let min = $input.attr('min-value') && $input.attr('min-value') !== "undefined" ? $input.attr('min-value') : null;
+        let max = $input.attr('max-value') && $input.attr('max-value') !== "undefined" ? $input.attr('max-value') : null;
+
+        let decimals = $input.attr('decimals') ? $input.attr('decimals') : globals.cifre_decimali;
+
+        let autonumeric = new AutoNumeric(input, {
             caretPositionOnFocus: "decimalLeft",
             allowDecimalPadding: true,
             currencySymbolPlacement: "s",
@@ -26,6 +32,7 @@ function initNumbers() {
             decimalPlaces: decimals,
         });
 
-        $this.data("autonumeric", autonumeric);
-    }).addClass('bound');
+        $input.data("autonumeric", autonumeric)
+            .addClass('bound');
+    }
 }
diff --git a/assets/src/js/functions/select.js b/assets/src/js/functions/select.js
index 7be6e6ae0..8d0d0874d 100755
--- a/assets/src/js/functions/select.js
+++ b/assets/src/js/functions/select.js
@@ -118,6 +118,7 @@ function selectBackground(data, container) {
 
     return data.text;
 }
+
 /**
  * Reimposta i contenuti di un <select> creato con select2.
  */
@@ -206,11 +207,16 @@ jQuery.fn.selectData = function () {
     let selectData = this.select2('data');
 
     if (this.prop('multiple')) {
-        return selectData;
+        let results = [];
+        for (const option of selectData) {
+            results.push(option.element.dataset);
+        }
+
+        return results;
     } else if (selectData.length === 0) {
         return undefined;
     } else {
-        return selectData[0];
+        return selectData[0].element.dataset;
     }
 };
 
diff --git a/modules/articoli/edit.php b/modules/articoli/edit.php
index 0c366a9c6..64e6e544a 100755
--- a/modules/articoli/edit.php
+++ b/modules/articoli/edit.php
@@ -184,7 +184,9 @@ include_once __DIR__.'/../../core.php';
 $prezzi_ivati = setting('Utilizza prezzi di vendita comprensivi di IVA');
 if (empty($prezzi_ivati)) {
     echo '
-                            <button type="button" class="btn btn-info btn-xs pull-right tip pull-right" title="'.tr('Scorpora iva dal prezzo di vendita.').'" id="scorpora_iva"><i class="fa fa-calculator" aria-hidden="true"></i></button>';
+                            <button type="button" class="btn btn-info btn-xs pull-right tip pull-right" title="'.tr('Scorpora iva dal prezzo di vendita.').'" id="scorporaIva">
+                                <i class="fa fa-calculator"></i>
+                            </button>';
 }
 
 echo '
@@ -331,15 +333,17 @@ $("#categoria").change(function() {
 	$("#subcategoria").val(null).trigger("change");
 });
 
-function scorpora_iva() {
-	if ($("#idiva_vendita").val()!=''){
-		var percentuale = parseFloat($("#idiva_vendita").selectData().percentuale);
+function scorporaIva() {
+    let iva_vendita = $("#idiva_vendita");
+
+	if (iva_vendita.val()) {
+		let percentuale = parseFloat(iva_vendita.selectData().percentuale);
 		if(!percentuale) return;
 
-		var input = $("#prezzo_vendita");
-		var prezzo = input.val().toEnglish();
+		let input = $("#prezzo_vendita");
+        let prezzo = input.val().toEnglish();
 
-		var scorporato = prezzo * 100 / (100 + percentuale);
+        let scorporato = prezzo * 100 / (100 + percentuale);
 
 		input.val(scorporato);
 	}else{
@@ -347,8 +351,8 @@ function scorpora_iva() {
 	}
 }
 
-$("#scorpora_iva").click( function() {
-	scorpora_iva();
+$("#scorporaIva").click( function() {
+	scorporaIva();
 });
 
 </script>
diff --git a/src/HTMLBuilder/Manager/FileManager.php b/src/HTMLBuilder/Manager/FileManager.php
index 1332740c3..0efad8094 100755
--- a/src/HTMLBuilder/Manager/FileManager.php
+++ b/src/HTMLBuilder/Manager/FileManager.php
@@ -190,7 +190,7 @@ class FileManager implements ManagerInterface
             {[ "type": "text", "placeholder": "'.tr('Nome file').'", "name": "nome_allegato", "class": "unblockable" ]}
         </div>
         <div class="col-md-6">
-            {[ "type": "text", "placeholder": "'.tr('Categoria').'", "name": "categoria", "class": "unblockable" ]}
+            {[ "type": "text", "placeholder": "'.tr('Categoria').'", "name": "categoria_allegato", "id": "categoria_allegato", "class": "unblockable" ]}
         </div>
         <div class="col-md-12">
             <div class="dropzone dz-clickable" id="dragdrop">
@@ -244,7 +244,7 @@ $(document).ready(function() {
         url: "'.ROOTDIR.'/actions.php?op=link_file&id_module='.$options['id_module'].'&id_record='.$options['id_record'].'&id_plugin='.$options['id_plugin'].'",
         init: function (file, xhr, formData) {
             this.on("sending", function(file, xhr, formData) {
-                formData.append("categoria", $("#categoria").val());
+                formData.append("categoria", $("#categoria_allegato").val());
                 formData.append("nome_allegato", $("#nome_allegato").val());
             });
 
@@ -323,7 +323,7 @@ $(document).ready(function() {
     });
 
     // Autocompletamento categoria
-    $("#'.$attachment_id.' #categoria").autocomplete({
+    $("#'.$attachment_id.' #categoria_allegato").autocomplete({
         source: '.json_encode($source).',
         minLength: 0
     }).focus(function() {