Merge branch 'master' into develop

.idea/runConfigurations/Tomcat.xml

@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Tomcat" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
     <option name="COMMON_VM_ARGUMENTS" value="-Xms512m -Xmx2048m" />
+    <option name="UPDATING_POLICY" value="restart-server" />
     <deployment>
       <artifact name="ems-engine:war exploded">
         <settings>

ems-core/src/main/java/it/integry/ems_model/utility/UtilityLocalDate.java

@@ -44,6 +44,9 @@ public class UtilityLocalDate {
     }
 
     public static LocalDate localDateFromDate(Date dateToConvert) {
+        if (dateToConvert instanceof java.sql.Date){
+            dateToConvert = new Date(dateToConvert.getTime());
+        }
         return dateToConvert.toInstant()
                 .atZone(currentZone)
                 .toLocalDate();

ems-engine/src/main/java/it/integry/ems/order/javabeans/OrdiniWebFollie.java

@@ -439,7 +439,7 @@ public class OrdiniWebFollie {
                         throw new Exception("Nazione del cliente nulla, valorizzare la nazione del cliente per proseguire");
                     }
 
-                    if (nazione.equalsIgnoreCase(nazioneAzienda)) {
+                    if (!nazione.equalsIgnoreCase(nazioneAzienda)) {
                         codTaglGrtg = codtaglGrtgEstera;
                     }