lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove seteventMessage *

Browse Source 
precheck automail on selected auto validation
This commit is contained in:
jpb 2022-06-11 14:01:54 +02:00
parent e97334848c
commit 74d23cccd8
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/holiday/card_group.php
View File

@ -281,7 +281,7 @@ if (empty($reshook)) {
// Check if there is already holiday for this period pour chaque user // Check if there is already holiday for this period pour chaque user
$verifCP = $object->verifDateHolidayCP($u, $date_debut, $date_fin, $halfday); $verifCP = $object->verifDateHolidayCP($u, $date_debut, $date_fin, $halfday);
if (!$verifCP) { if (!$verifCP) {
setEventMessages($langs->trans("alreadyCPexist"), null, 'errors'); //setEventMessages($langs->trans("alreadyCPexist"), null, 'errors');
$userError = new User($db); $userError = new User($db);
$result = $userError->fetch($u); $result = $userError->fetch($u);
@ -342,7 +342,7 @@ if (empty($reshook)) {
// If no SQL error we redirect to the request card // If no SQL error we redirect to the request card
if (!$error) { if (!$error) {
$db->commit(); $db->commit();
header('Location: '.DOL_URL_ROOT.'/holiday/list.php?restore_lastsearch_values=1'); header('Location: '.DOL_URL_ROOT.'/holiday/list.php');
exit; exit;
} else { } else {
$db->rollback(); $db->rollback();
@ -414,10 +414,27 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
if( $("input[name=autoValidation]").is(":checked") ){ if( $("input[name=autoValidation]").is(":checked") ){
$("#AutoSendMail").prop("disabled", false); $("#AutoSendMail").prop("disabled", false);
$("#AutoSendMail").prop("checked", true);
} else { } else {
$("#AutoSendMail").prop("disabled", true); $("#AutoSendMail").prop("disabled", true);
$("#AutoSendMail").prop("checked", false);
} }
$("input[name=autoValidation]").click( function(e) {
console.log("chang")
if( $("input[name=autoValidation]").is(":checked") ){
$("#AutoSendMail").prop("disabled", false);
$("#AutoSendMail").prop("checked", true);
} else {
$("#AutoSendMail").prop("disabled", true);
$("#AutoSendMail").prop("checked", false);
}
});
$("input.button-save").click("submit", function(e) { $("input.button-save").click("submit", function(e) {
console.log("Call valider()"); console.log("Call valider()");
if (document.demandeCP.date_debut_.value != "") if (document.demandeCP.date_debut_.value != "")
@ -588,7 +605,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
print '</tr>'; print '</tr>';
//auto validation ON CREATE //auto validation ON CREATE
print '<tr><td>'.$langs->trans("AutoApprovalOnCreate").'</td><td>'; print '<tr><td>'.$langs->trans("AutoValidationOnCreate").'</td><td>';
print '<input type="checkbox" id="autoValidation" name="autoValidation" value="1"'.($autoValidation ? ' checked="checked"' : '').'>'; print '<input type="checkbox" id="autoValidation" name="autoValidation" value="1"'.($autoValidation ? ' checked="checked"' : '').'>';
print '</td></tr>'."\n"; print '</td></tr>'."\n";
@ -658,10 +675,10 @@ function sendMail($id, $cancreate, $now, $autoValidation)
if ($result) { if ($result) {
// If draft and owner of leave // If draft and owner of leave
if ($object->statut == Holiday::STATUS_DRAFT && $cancreate) { if ($object->statut == Holiday::STATUS_VALIDATED && $cancreate) {
$object->oldcopy = dol_clone($object); $object->oldcopy = dol_clone($object);
if ($autoValidation) $object->statut = Holiday::STATUS_VALIDATED; //if ($autoValidation) $object->statut = Holiday::STATUS_VALIDATED;
$verif = $object->validate($user); $verif = $object->validate($user);