diff --git a/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php b/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php index 66fcd466d8703b5ca86798c35acbd292635d5e2a..2580a690bf086390a51214ac15745a586c0c0552 100755 --- a/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php +++ b/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php @@ -147,7 +147,7 @@ function check_form($form_id, $values) 'validation_date', 'relation', 'attachment_id_master' ], 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP')", "in_signature_book = 'true'"], - 'data' => [$resId, ['converted_pdf', 'incoming_mail_attachment', 'print_folder', 'signed_response']] + 'data' => [$resId, ['converted_pdf', 'print_folder', 'signed_response']] ]); foreach ($attachments as $value) { @@ -355,7 +355,7 @@ function hasAttachmentError() 'count(1) as nb' ], 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP')", "in_signature_book = 'true'"], - 'data' => [$resId, ['converted_pdf', 'incoming_mail_attachment', 'print_folder', 'signed_response']] + 'data' => [$resId, ['converted_pdf', 'print_folder', 'signed_response']] ]); if ($attachments[0]['nb'] == 0) { $noAttachmentsResource = \Resource\models\ResModel::getExtById(['resId' => $resId, 'select' => ['alt_identifier']]); diff --git a/src/app/action/controllers/ExternalSignatoryBookTrait.php b/src/app/action/controllers/ExternalSignatoryBookTrait.php index 31cd7bd2881685f5d032c88c8b83baad11e7442f..fc16db017f36c66155e2f3c223a149927c1e6403 100644 --- a/src/app/action/controllers/ExternalSignatoryBookTrait.php +++ b/src/app/action/controllers/ExternalSignatoryBookTrait.php @@ -52,7 +52,7 @@ trait ExternalSignatoryBookTrait 'count(1) as nb' ], 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP', 'SEND_MASS')", "in_signature_book = 'true'"], - 'data' => [$args['resId'], ['converted_pdf', 'incoming_mail_attachment', 'print_folder', 'signed_response']] + 'data' => [$args['resId'], ['converted_pdf', 'print_folder', 'signed_response']] ]); if ($attachments[0]['nb'] == 0 && $args['data']['objectSent'] == 'attachment') { $noAttachmentsResource = ResModel::getExtById(['resId' => $args['resId'], 'select' => ['alt_identifier']]); @@ -80,7 +80,7 @@ trait ExternalSignatoryBookTrait 'count(1) as nb' ], 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP', 'SEND_MASS')", "in_signature_book = 'true'"], - 'data' => [$args['resId'], ['converted_pdf', 'incoming_mail_attachment', 'print_folder', 'signed_response']] + 'data' => [$args['resId'], ['converted_pdf', 'print_folder', 'signed_response']] ]); if ($attachments[0]['nb'] == 0) { $noAttachmentsResource = ResModel::getExtById(['resId' => $args['resId'], 'select' => ['alt_identifier']]); diff --git a/src/app/action/controllers/PreProcessActionController.php b/src/app/action/controllers/PreProcessActionController.php index c9636936293e7748a86436f7e789f2de89ddca23..37c5af6bb5272fc0825263dc9329664acbed69da 100644 --- a/src/app/action/controllers/PreProcessActionController.php +++ b/src/app/action/controllers/PreProcessActionController.php @@ -471,7 +471,7 @@ class PreProcessActionController 'validation_date', 'relation', 'attachment_id_master' ], 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP', 'SEND_MASS')", "in_signature_book = 'true'"], - 'data' => [$resId, ['converted_pdf', 'incoming_mail_attachment', 'print_folder', 'signed_response']] + 'data' => [$resId, ['converted_pdf', 'print_folder', 'signed_response']] ]); if (empty($attachments)) { @@ -526,7 +526,7 @@ class PreProcessActionController 'validation_date', 'relation', 'attachment_id_master' ], 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP', 'SEND_MASS')", "in_signature_book = 'true'"], - 'data' => [$resId, ['converted_pdf', 'incoming_mail_attachment', 'print_folder', 'signed_response']] + 'data' => [$resId, ['converted_pdf', 'print_folder', 'signed_response']] ]); if (empty($attachments)) { diff --git a/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php b/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php index e783474e6be2b7875a66667f90e651655a8285ca..e2c15bb529758a05b3983fff9858ce0ddb72c471 100755 --- a/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php +++ b/src/app/external/externalSignatoryBook/controllers/MaarchParapheurController.php @@ -178,7 +178,7 @@ class MaarchParapheurController $senderPrimaryEntity = UserModel::getPrimaryEntityByUserId(['userId' => $aArgs['userId']]); if ($aArgs['objectSent'] == 'attachment') { - $excludeAttachmentTypes = ['converted_pdf', 'print_folder', 'incoming_mail_attachment', 'signed_response']; + $excludeAttachmentTypes = ['converted_pdf', 'print_folder', 'signed_response']; $attachments = AttachmentModel::getOnView([ 'select' => [ @@ -186,7 +186,7 @@ class MaarchParapheurController 'status', 'typist', 'docserver_id', 'path', 'filename', 'creation_date', 'validation_date', 'relation', 'attachment_id_master' ], - 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP')", "in_signature_book = 'true'"], + 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP', 'SEND_MASS')", "in_signature_book = 'true'"], 'data' => [$aArgs['resIdMaster'], $excludeAttachmentTypes] ]); diff --git a/src/app/external/externalSignatoryBook/controllers/XParaphController.php b/src/app/external/externalSignatoryBook/controllers/XParaphController.php index ce327177ebc72584775ffbce41df914ea22d8ed7..9bf849e5086c4547aeca4ab769f83e30735b15f8 100755 --- a/src/app/external/externalSignatoryBook/controllers/XParaphController.php +++ b/src/app/external/externalSignatoryBook/controllers/XParaphController.php @@ -31,8 +31,8 @@ class XParaphController $attachments = AttachmentModel::getOnView([ 'select' => [ 'res_id', 'res_id_version', 'title'], - 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP')", "in_signature_book = 'true'"], - 'data' => [$aArgs['resIdMaster'], ['converted_pdf', 'incoming_mail_attachment', 'print_folder', 'signed_response']] + 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP', 'SEND_MASS')", "in_signature_book = 'true'"], + 'data' => [$aArgs['resIdMaster'], ['converted_pdf', 'print_folder', 'signed_response']] ]); $attachmentToFreeze = [];