Merge branch 'develop' into feature/Feature-CAPELLIMONELLI

ems-core/src/main/java/it/integry/ems/schedule/new_cron_job/dto/operations/runners/ImportScheduledOperationRunner.java

@@ -24,7 +24,7 @@ public class ImportScheduledOperationRunner extends BaseScheduledOperationRunner
         ImportRequestDTO importRequestDTO = new ImportRequestDTO(
                 getDtoInstance().getPathFile(),
                 getDtoInstance().getWhereCond(),
-                getDtoInstance().getWhereCond());
+                getDtoInstance().getRawContent());
 
         String baseUrl = "http://localhost:" + port + "/ems-api";
         StringBuilder jsonResponse = new StringBuilder();

ems-core/src/main/java/it/integry/ems_model/entity/StbUser.java

@@ -173,8 +173,8 @@ public class StbUser extends EntityBase {
     @EntityChild
     private List<JrlFlavUsers> jrlFlavUsers = new ArrayList<>();
 
-    @Priority(101)
-    private SrlActivityTypeUser srlActivityTypeUser;
+    @EntityChild
+    private List<SrlActivityTypeUser> srlActivityTypeUser  = new ArrayList<>();
 
     public StbUser() {
         super(logger);
@@ -521,11 +521,11 @@ public class StbUser extends EntityBase {
         return this;
     }
 
-    public SrlActivityTypeUser getSrlActivityTypeUser() {
+    public List<SrlActivityTypeUser> getSrlActivityTypeUser() {
         return srlActivityTypeUser;
     }
 
-    public StbUser setSrlActivityTypeUser(SrlActivityTypeUser srlActivityTypeUser) {
+    public StbUser setSrlActivityTypeUser(List<SrlActivityTypeUser> srlActivityTypeUser) {
         this.srlActivityTypeUser = srlActivityTypeUser;
         return this;
     }
@@ -629,74 +629,6 @@ public class StbUser extends EntityBase {
         return this;
     }
 
-    @Override
-    protected void insertChilds() throws Exception {
-        if (getStbAbil() != null) {
-            for (StbAbil stbAbil : getStbAbil()) {
-                stbAbil.manageWithParentConnection(connection, stbAbil.getOperation(), dataCompleting, entityHolder);
-            }
-        }
-        for (SrlUser srlUser : getSrlUser()) {
-            srlUser.manageWithParentConnection(connection, srlUser.getOperation(), dataCompleting, entityHolder);
-        }
-        for (StbGestDf stbGestDf : getStbGestDf()) {
-            stbGestDf.manageWithParentConnection(connection, stbGestDf.getOperation(), dataCompleting, entityHolder);
-        }
-        for (StbFilterDf stbFilterDf : getStbFilterDf()) {
-            stbFilterDf.manageWithParentConnection(connection, stbFilterDf.getOperation(), dataCompleting, entityHolder);
-        }
-        for (StbEditLimit stbEditLimit : getStbEditLimit()) {
-            stbEditLimit.manageWithParentConnection(connection, stbEditLimit.getOperation(), dataCompleting, entityHolder);
-        }
-        for (StbLookupLimit stbLookupLimit : getStbLookupLimit()) {
-            stbLookupLimit.manageWithParentConnection(connection, stbLookupLimit.getOperation(), dataCompleting, entityHolder);
-        }
-        for (StbObjectCustom stbObjectCustom : getStbObjectCustom()) {
-            stbObjectCustom.manageWithParentConnection(connection, stbObjectCustom.getOperation(), dataCompleting, entityHolder);
-        }
-        for (WtbGestSetupUser wtbGestSetupUser : getWtbGestSetupUser()) {
-            wtbGestSetupUser.manageWithParentConnection(connection, wtbGestSetupUser.getOperation(), dataCompleting, entityHolder);
-        }
-        for (WtbClie wtbClie : getWtbClie()) {
-            wtbClie.manageWithParentConnection(connection, wtbClie.getOperation(), dataCompleting, entityHolder);
-        }
-        for (WtbClieDest wtbClieDest : getWtbClieDest()) {
-            wtbClieDest.manageWithParentConnection(connection, wtbClieDest.getOperation(), dataCompleting, entityHolder);
-        }
-        for (WrlUsersFasi wrlUsersFasi : getWrlUsersFasi()) {
-            wrlUsersFasi.manageWithParentConnection(connection, wrlUsersFasi.getOperation(), dataCompleting, entityHolder);
-        }
-        for (WtbFavoriteArt wtbFavoriteArt : getWtbFavoriteArt()) {
-            wtbFavoriteArt.manageWithParentConnection(connection, wtbFavoriteArt.getOperation(), dataCompleting, entityHolder);
-        }
-        for (WtbUsersInfo wtbUsersInfo : getWtbUsersInfo()) {
-            wtbUsersInfo.manageWithParentConnection(connection, wtbUsersInfo.getOperation(), dataCompleting, entityHolder);
-        }
-        for (WtbDepo wtbDepo : getWtbDepo()) {
-            wtbDepo.manageWithParentConnection(connection, wtbDepo.getOperation(), dataCompleting, entityHolder);
-        }
-        for (WtbForn wtbForn : getWtbForn()) {
-            wtbForn.manageWithParentConnection(connection, wtbForn.getOperation(), dataCompleting, entityHolder);
-        }
-        for (WtbFornDest wtbFornDest : getWtbFornDest()) {
-            wtbFornDest.manageWithParentConnection(connection, wtbFornDest.getOperation(), dataCompleting, entityHolder);
-        }
-        for (WtbPros wtbPros : getWtbPros()) {
-            wtbPros.manageWithParentConnection(connection, wtbPros.getOperation(), dataCompleting, entityHolder);
-        }
-        for (SrlUserAttached srlUserAttached : getSrlUserAttached()) {
-            srlUserAttached.manageWithParentConnection(connection, srlUserAttached.getOperation(), dataCompleting, entityHolder);
-        }
-        for (JrlFlavUsers jrlFlavUsers : getJrlFlavUsers()) {
-            jrlFlavUsers.manageWithParentConnection(connection, jrlFlavUsers.getOperation(), dataCompleting, entityHolder);
-        }
-    }
-
-    @Override
-    protected void updateChilds() throws Exception {
-        insertChilds();
-    }
-
     @Override
     protected void deleteChilds() throws Exception {
         String sql = "UPDATE mtb_depo_intercode SET user_name = null " + " WHERE user_name = %s ";

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

@@ -193,7 +193,8 @@ public class UtilityLocalDate {
     }
 
     public static boolean isNull(LocalDate dateToCheck) {
-        return dateToCheck == null || dateToCheck.equals(EmsRestConstants.LOCAL_DATE_NULL) ;
+        return dateToCheck == null || dateToCheck.equals(EmsRestConstants.LOCAL_DATE_NULL) ||
+                UtilityLocalDate.localDateToDate(dateToCheck) == EmsRestConstants.DATE_NULL;
     }
 
     public static LocalDate isNull(LocalDate dateToCheck, LocalDate fallbackValue) {

ems-core/src/main/resources/rules/production.drl

@@ -147,7 +147,8 @@ rule "completeDaOraRapp"
 no-loop
 when
 	eval(completeRulesEnabled)
-	$rLavR: JtbRLavr(dataLav != null && !UtilityLocalDate.isNull(daOra) != null && UtilityLocalDate.daysAfterDate(dataLav, daOra.toLocalDate()) != 0 )
+	$rLavR: JtbRLavr(dataLav != null && !UtilityLocalDate.isNull(daOra) &&
+	        UtilityLocalDate.daysAfterDate(dataLav, daOra.toLocalDate()) != 0 )
 then
     LocalDateTime daOra = ProductionsRules.recalcDataRapp($rLavR.getDataLav(), $rLavR.getDaOra());
     modify ( $rLavR ) { setDaOra(daOra) }

ems-engine/src/main/java/it/integry/ems/document/fatture/services/PassiveInvoiceService.java

@@ -350,7 +350,7 @@ public class PassiveInvoiceService {
         attachments.add(new EmailFileAttachment("messaggio.eml", IOUtils.toByteArray(msg.getInputStream())));
 
         mailService.sendErrorMail(connection, emailDest, errorMailSubject,
-                "importazione delle fatture passive", null, attachments, null,
+                "importazione delle fatture passive o stato fatture inviate", null, attachments, null,
                 Collections.singletonList(ex));
     }
 

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

@@ -250,7 +250,7 @@ public class MmposServices {
 
                 try {
                     entityBaseList.add(ntbDoct);
-                    if (!recuperoScontrini) {
+                    if (!recuperoScontrini && ntbDoct.getCausale().equalsIgnoreCase("V")) {
                         MtbDepo mtbDepo = new MtbDepo()
                                 .setCodMdep(ntbDoct.getCodMdep());
                         MtbDepoCasse mtbDepoCasse = new MtbDepoCasse()