FIX do not exclude incoming_mail_attachment for external signatory book

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']]);

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']]);

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)) {

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]
             ]);
 

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 = [];