Merge branch 'master' into develop

ems-engine/src/main/java/it/integry/ems/retail/Scontrini/service/MmposServices.java

@@ -524,7 +524,7 @@ public class MmposServices {
         String opTrans = row.getOpTrans();
         if (!UtilityString.isNullOrEmpty(opTrans) &&
                 !opTrans.toUpperCase().startsWith("ORD") &&
-                !opTrans.toUpperCase().startsWith("RS")) {
+                !row.getFlTrans().toUpperCase().startsWith("RS")) {
             ntbDocr.setCausaleReso(opTrans);
         }
 

ems-engine/src/main/java/it/integry/ems/retail/Scontrini/service/ScontriniImporterUtilities.java

@@ -35,11 +35,7 @@ public class ScontriniImporterUtilities {
             return AnomalieDTO.warning(e.getMessage());
         } else if (e instanceof FileNotFoundException) {
             return  AnomalieDTO.error(e);
-        } else {
-            return  AnomalieDTO.error(e);
         }
-
-        return null;
-
+        return  AnomalieDTO.error(e);
     }
 }