diff --git a/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php b/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php index 5ba0f8f199957c0e92a7d17eee87e2592df4a3fc..8db9f0bf084d5c46a9c4b8566b35d9ec41cf228e 100644 --- a/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php +++ b/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php @@ -109,9 +109,9 @@ function check_form($form_id, $values) } } if ($config['id'] == 'maarchParapheur') { - $objectSent = get_value_fields($values, 'objectSent'); + $objectSentSign = get_value_fields($values, 'objectSentSign'); $hasAttachmentError = hasAttachmentError(); - if ($objectSent == 'attachment' && $hasAttachmentError['error']) { + if ($objectSentSign == 'attachment' && $hasAttachmentError['error']) { if (!empty($_SESSION['stockCheckbox'])) { $_SESSION['action_error'] = _MAIL_HAS_NO_RESPONSE_PROJECT . ' : ' . implode(",", $hasAttachmentError['resList']); } else { @@ -166,7 +166,13 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col include_once 'modules/visa/class/MaarchParapheurController.php'; $processingUser = get_value_fields($values_form, 'processingUser'); - $objectSent = get_value_fields($values_form, 'objectSent'); + $objectSentNote = get_value_fields($values_form, 'objectSentNote'); + $objectSentSign = get_value_fields($values_form, 'objectSentSign'); + if (!empty($objectSentNote)) { + $objectSent = $objectSentNote; + } else { + $objectSent = $objectSentSign; + } $attachmentToFreeze = MaarchParapheurController::sendDatas([ 'config' => $config, 'resIdMaster' => $res_id, diff --git a/modules/visa/class/MaarchParapheurController.php b/modules/visa/class/MaarchParapheurController.php index 69e6185cc3a5f9c377a78f17d04a2789e78573ee..5903731b5f09da855ca78abae1768ef69ac040ea 100755 --- a/modules/visa/class/MaarchParapheurController.php +++ b/modules/visa/class/MaarchParapheurController.php @@ -30,7 +30,8 @@ class MaarchParapheurController } } $html .= '</select><br /><br /><br /><br />'; - $html .= '<input type="radio" name="objectSent" id="objectSent" value="mail" checked="checked" />' . _MAIL_NOTE . '<br/><input type="radio" name="objectSent" id="objectSent" value="attachment" />' . _ATTACHMENT_SIGNATURE .'<br /><br />'; + $html .= '<input type="radio" name="objectSent" id="objectSentNote" value="mail" checked="checked" /><label for="objectSentNote" style="float: none;display: unset;">' . _MAIL_NOTE . '</label><br/>'; + $html .= '<input type="radio" name="objectSent" id="objectSentSign" value="attachment" /><label for="objectSentSign" style="float: none;display: unset;">' . _ATTACHMENT_SIGNATURE .'</label><br /><br />'; return $html; }