diff --git a/ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java b/ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java
index 2438aaefa7..1e49a8bf9f 100644
--- a/ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java
+++ b/ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java
@@ -16,6 +16,7 @@ import it.integry.ems.service.EntityProcessor;
 import it.integry.ems.sync.MultiDBTransaction.Connection;
 import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
 import it.integry.ems.user.service.UserService;
+import it.integry.ems.utility.UtilityDebug;
 import it.integry.ems.utility.UtilityEntity;
 import it.integry.ems.utility.UtilityFile;
 import it.integry.ems_model.base.EntityBase;
@@ -164,7 +165,9 @@ public class CrmService {
             if (createContact.getActivityRequest() != null) {
                 response.setStbActivity(
                         createNewActivity(
-                                createContact.getActivityRequest(),
+                                createContact
+                                        .getActivityRequest()
+                                        .setCodJcom(codJcom),
                                 new CRMCreateNewCommessaRequestDTO()
                                         .setCommessa(createContact.getCommessa()),
                                 createContact.getCliente()
@@ -568,43 +571,45 @@ public class CrmService {
             ptbPrevt.setOperation(OperationType.INSERT);
             entityProcessor.processEntity(ptbPrevt, true, multiDBTransactionManager);
 
-            if (!pathFolderPrevt.isEmpty() && !nameFileCheckList.isEmpty()) {
-                ls_nextNumFile = PreventRules.getNextNumFile(conn);
+            if (!UtilityDebug.isDebugExecution()){
+                if (!pathFolderPrevt.isEmpty() && !nameFileCheckList.isEmpty()) {
+                    ls_nextNumFile = PreventRules.getNextNumFile(conn);
 
-                if (!UtilityFile.directoryExists(pathFolderPrevt)) {
-                    if (!UtilityFile.directoryCreate(pathFolderPrevt)) {
-                        throw new Exception(String.format("Errore durante la creazione della directory %s", pathFolderPrevt));
+                    if (!UtilityFile.directoryExists(pathFolderPrevt)) {
+                        if (!UtilityFile.directoryCreate(pathFolderPrevt)) {
+                            throw new Exception(String.format("Errore durante la creazione della directory %s", pathFolderPrevt));
+                        }
                     }
+
+                    sql = Query.format(
+                            "SELECT id_attach\n" +
+                                    "FROM stb_files_attached\n" +
+                                    "WHERE file_name = %s",
+                            nameFileCheckList
+                    );
+
+                    List<StbFilesAttached> stbFilesAttachedList = Stream.of(UtilityDB.executeSimpleQueryOnlyFirstColumn(conn, sql))
+                            .map(s -> {
+                                StbFilesAttached stbFilesAttached = new StbFilesAttached();
+                                stbFilesAttached.setIdAttach((String) s);
+                                stbFilesAttached.setOperation(OperationType.SELECT_OBJECT);
+                                return stbFilesAttached;
+                            }).toList();
+
+                    stbFilesAttachedList = UtilityEntity.toCustomEntity(entityProcessor.processEntityList(stbFilesAttachedList, true));
+
+                    if (!stbFilesAttachedList.isEmpty()) {
+                        FileUtils.writeByteArrayToFile(new File(pathFolderPrevt + File.separator + ls_nextNumFile + ".xls"), stbFilesAttachedList.get(0).getContent());
+                    }
+
+                    PtbPrevtFile ptbPrevtFile = new PtbPrevtFile()
+                            .setIdOfferta(idOfferta)
+                            .setDataGen(new Date())
+                            .setNomeFile(ls_nextNumFile + ".xls");
+
+                    ptbPrevtFile.setOperation(OperationType.INSERT);
+                    entityProcessor.processEntity(ptbPrevtFile, true, multiDBTransactionManager);
                 }
-
-                sql = Query.format(
-                        "SELECT id_attach\n" +
-                                "FROM stb_files_attached\n" +
-                                "WHERE file_name = %s",
-                        nameFileCheckList
-                );
-
-                List<StbFilesAttached> stbFilesAttachedList = Stream.of(UtilityDB.executeSimpleQueryOnlyFirstColumn(conn, sql))
-                        .map(s -> {
-                            StbFilesAttached stbFilesAttached = new StbFilesAttached();
-                            stbFilesAttached.setIdAttach((String) s);
-                            stbFilesAttached.setOperation(OperationType.SELECT_OBJECT);
-                            return stbFilesAttached;
-                        }).toList();
-
-                stbFilesAttachedList = UtilityEntity.toCustomEntity(entityProcessor.processEntityList(stbFilesAttachedList, true));
-
-                if (!stbFilesAttachedList.isEmpty()) {
-                    FileUtils.writeByteArrayToFile(new File(pathFolderPrevt + File.separator + ls_nextNumFile + ".xls"), stbFilesAttachedList.get(0).getContent());
-                }
-
-                PtbPrevtFile ptbPrevtFile = new PtbPrevtFile()
-                        .setIdOfferta(idOfferta)
-                        .setDataGen(new Date())
-                        .setNomeFile(ls_nextNumFile + ".xls");
-
-                ptbPrevtFile.setOperation(OperationType.INSERT);
-                entityProcessor.processEntity(ptbPrevtFile, true, multiDBTransactionManager);
             }
         } else {
             throw new Exception("Dati per preventivo inesistenti");
@@ -644,6 +649,7 @@ public class CrmService {
                     .setUserName(userName)
                     .setActivityDescription(activityDescription)
                     .setUserCreator(requestDataDTO.getUsername())
+                    .setCodJcom(activityRequest.getCodJcom())
                     .setEstimatedTime(new Date());
 
             parentActivity.setOperation(OperationType.INSERT);