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

add todo for some jquery

Browse Source
This commit is contained in:
jpb 2022-06-07 19:12:40 +02:00
parent c434e9cffe
commit 02a4e10fd3
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
htdocs/holiday/card_group.php
View File

@ -51,7 +51,7 @@ $fuserid = (GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id);
$users = (GETPOST('users', 'array') ?GETPOST('users', 'array') : array($user->id)); $users = (GETPOST('users', 'array') ?GETPOST('users', 'array') : array($user->id));
$groups = GETPOST('groups', 'array') ; $groups = GETPOST('groups', 'array') ;
$socid = GETPOST('socid', 'int'); $socid = GETPOST('socid', 'int');
$autoApproval = GETPOST('autoApproval','int'); $autoValidation = GETPOST('autoValidation','int');
$AutoSendMail = GETPOST('AutoSendMail','int'); $AutoSendMail = GETPOST('AutoSendMail','int');
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("other", "holiday", "mails", "trips")); $langs->loadLangs(array("other", "holiday", "mails", "trips"));
@ -323,26 +323,26 @@ if (empty($reshook)) {
}else{ }else{
// AUTO APPROUVAL /VALIDATED // AUTO APPROUVAL /VALIDATED
//@TODO changer le nom si approuved / validated //@TODO changer le nom si approuved / validated
if ($autoApproval){ if ($autoValidation){
$htemp = new Holiday($db); $htemp = new Holiday($db);
$htemp->fetch ($result); $htemp->fetch ($result);
// must set the status before approve call ...
$htemp->statut = Holiday::STATUS_VALIDATED;
// $resultApproved = $htemp->approve($approverid);
//@todo à voir avec nico validated ou approuved ? $htemp->statut = Holiday::STATUS_VALIDATED;
$resultValidated = $htemp->update($approverid); $resultValidated = $htemp->update($approverid);
if ($resultValidated < 0 ){ if ($resultValidated < 0 ){
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
$error++; $error++;
} }
// we can auto send mail if we are in auto validation behavior
//@todo jquery disable if checkbox autovalidation unchecked
if ($AutoSendMail && !$error){
// send a mail to the user
sendMail($result, $cancreate, $now, $autoValidation);
}
} }
if ($AutoSendMail && !$error){
// send a mail to the user
sendMail($result, $cancreate, $now);
}
} }
} }
@ -985,9 +985,16 @@ llxFooter();
if (is_object($db)) { if (is_object($db)) {
$db->close(); $db->close();
} }
/**
// automatic send mail * we send email to validator for current leave request (id)
function sendMail ($id, $cancreate, $now){ * @param $id
* @param $cancreate
* @param $now
* @param $autoValidation
* @return void
* @throws Exception
*/
function sendMail ($id, $cancreate, $now, $autoValidation){
global $db, $user, $conf, $langs; global $db, $user, $conf, $langs;
@ -1000,7 +1007,7 @@ function sendMail ($id, $cancreate, $now){
if ($object->statut == Holiday::STATUS_DRAFT && $cancreate) { if ($object->statut == Holiday::STATUS_DRAFT && $cancreate) {
$object->oldcopy = dol_clone($object); $object->oldcopy = dol_clone($object);
$object->statut = Holiday::STATUS_VALIDATED; if ($autoValidation) $object->statut = Holiday::STATUS_VALIDATED;
$verif = $object->validate($user); $verif = $object->validate($user);

2
htdocs/langs/en_US/holiday.lang
View File

@ -93,7 +93,7 @@ users=Users
AutoSendMail=Automatic mailing AutoSendMail=Automatic mailing
NewHolidayForGroup=Collective leaves NewHolidayForGroup=Collective leaves
SendRequestCollectiveCP=Send collective leave request SendRequestCollectiveCP=Send collective leave request
AutoApprovalOnCreate=Automatic approval AutoValidationOnCreate=Automatic validation
FirstDayOfHoliday=Beginning day of leave request FirstDayOfHoliday=Beginning day of leave request
LastDayOfHoliday=Ending day of leave request LastDayOfHoliday=Ending day of leave request
BoxTitleLastLeaveRequests=Latest %s modified leave requests BoxTitleLastLeaveRequests=Latest %s modified leave requests