diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
new file mode 100644
index 0000000000..02b915b85f
--- /dev/null
+++ b/.idea/git_toolbox_prj.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Tomcat__1__ServerTomcat_.xml b/.idea/runConfigurations/Tomcat__1__ServerTomcat_.xml
index 4ce322ffd1..9dd0fe54d8 100644
--- a/.idea/runConfigurations/Tomcat__1__ServerTomcat_.xml
+++ b/.idea/runConfigurations/Tomcat__1__ServerTomcat_.xml
@@ -4,7 +4,7 @@
     <option name="USE_SOCKET_TRANSPORT" value="true" />
     <option name="SERVER_MODE" value="false" />
     <option name="SHMEM_ADDRESS" />
-    <option name="HOST" value="servertomcat" />
+    <option name="HOST" value="localhost" />
     <option name="PORT" value="8000" />
     <option name="AUTO_RESTART" value="false" />
     <method v="2" />
diff --git a/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java b/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java
index 5f91c34cad..3b92b152db 100644
--- a/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java
+++ b/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java
@@ -178,10 +178,12 @@ public abstract class BaseMigration implements MigrationModelInterface {
     }
 
 
-    protected void createSetupQuery(String codQuery, String name, String query) throws SQLException, IOException {
+    protected void createSetupQuery(String codQuery, String name, String query, boolean override) throws SQLException, IOException {
+        if(override)
+            executeStatement(Query.format("DELETE FROM stb_gest_setup_query WHERE cod_query = %s", codQuery));
+
         executeStatement(Query.format("INSERT INTO stb_gest_setup_query (cod_query, query_default, description)"+
                 " VALUES (%s, %s, %s);", codQuery, query, name));
-
     }
 
     protected boolean existsSetup(String gestName, String section, String keySection) throws SQLException, IOException {
diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240314133221.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240314133221.java
index 8750693289..1f24fc76eb 100644
--- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240314133221.java
+++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240314133221.java
@@ -10,8 +10,7 @@ public class Migration_20240314133221 extends BaseMigration implements Migration
         if (isHistoryDB())
             return;
 
-
-        createSetupQuery("TIPI_DEPO", "Tipi deposito", "SELECT cod_tipo_depo FROM mtb_depo_tipi");
+        createSetupQuery("TIPI_DEPO", "Tipi deposito", "SELECT cod_tipo_depo FROM mtb_depo_tipi", true);
 
         createSetup("PVM", "PIAN_ACC_ROSSG", "TIPI_DEPO_LAV", null,
                 "Identifica i tipi di deposito dove è possibile far arrivare la materia prima per la produzione.",
diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240328160115.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240328160115.java
new file mode 100644
index 0000000000..4c35d7b2b3
--- /dev/null
+++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240328160115.java
@@ -0,0 +1,23 @@
+package it.integry.ems.migration.model;
+
+import it.integry.ems.migration._base.BaseMigration;
+import it.integry.ems.migration._base.MigrationModelInterface;
+
+public class Migration_20240328160115 extends BaseMigration implements MigrationModelInterface {
+
+    @Override
+    public void up() throws Exception {
+        if (isHistoryDB()) return;
+
+
+        createSetup("DATI_AZIENDA", "CHECK_VERSIONE_APP", "AGGIORNAMENTO_AUTO_NEW", "N",
+                "Permette ai client di effettuare l'aggiornamento tramite la nuova procedura automatica. Disabilitare prima il flag AGGIORNAMENTO_AUTO",
+                "SI_NO");
+    }
+
+    @Override
+    public void down() throws Exception {
+
+    }
+
+}
\ No newline at end of file
diff --git a/fileTemplates/Entity.java b/fileTemplates/Entity.java
index 47c7172053..e7a80c5a2e 100644
--- a/fileTemplates/Entity.java
+++ b/fileTemplates/Entity.java
@@ -16,4 +16,4 @@ public class ${NAME} extends EntityBase {
     
     private static final long serialVerionUID = 1L;
     
-}
+}
\ No newline at end of file
diff --git a/fileTemplates/EntityChild.java b/fileTemplates/EntityChild.java
index bb1d0cf29c..479c501265 100644
--- a/fileTemplates/EntityChild.java
+++ b/fileTemplates/EntityChild.java
@@ -13,4 +13,4 @@ public class ${NAME} extends EntityBase {
     public static final String ENTITY = "${TABLE}";
     
 #[[$END$]]#
-}
+}
\ No newline at end of file
diff --git a/fileTemplates/IntegryMigrationClass.java b/fileTemplates/IntegryMigrationClass.java
index 2d439b0b81..5a1734e136 100644
--- a/fileTemplates/IntegryMigrationClass.java
+++ b/fileTemplates/IntegryMigrationClass.java
@@ -16,4 +16,4 @@ public class ${NAME} extends BaseMigration implements MigrationModelInterface{
 
     }
 
-}
+}
\ No newline at end of file