Fixing style errors.
This commit is contained in:
parent
8c607b8101
commit
c87c6ad042
@ -2282,7 +2282,6 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
|
|||||||
$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
|
$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
|
||||||
$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->readall, '', $mainmenu, 'holiday_sm');
|
$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->readall, '', $mainmenu, 'holiday_sm');
|
||||||
$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday, '', $mainmenu, 'holiday_sm');
|
$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday, '', $mainmenu, 'holiday_sm');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Trips and expenses (old module)
|
// Trips and expenses (old module)
|
||||||
|
|||||||
@ -162,7 +162,6 @@ if (empty($reshook)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!$error) {
|
if (!$error) {
|
||||||
|
|
||||||
$users = GETPOST('users', 'array');
|
$users = GETPOST('users', 'array');
|
||||||
$groups = GETPOST('groups', 'array');
|
$groups = GETPOST('groups', 'array');
|
||||||
|
|
||||||
@ -259,7 +258,6 @@ if (empty($reshook)) {
|
|||||||
|
|
||||||
|
|
||||||
if (!$error) {
|
if (!$error) {
|
||||||
|
|
||||||
$TusersToProcess = array();
|
$TusersToProcess = array();
|
||||||
|
|
||||||
/** GROUPS */
|
/** GROUPS */
|
||||||
@ -305,7 +303,6 @@ if (empty($reshook)) {
|
|||||||
$db->begin();
|
$db->begin();
|
||||||
// non errors we can insert all
|
// non errors we can insert all
|
||||||
foreach ($TusersToProcess as $u) {
|
foreach ($TusersToProcess as $u) {
|
||||||
|
|
||||||
$object = new Holiday($db);
|
$object = new Holiday($db);
|
||||||
$object->fk_user = $u;
|
$object->fk_user = $u;
|
||||||
$object->description = $description;
|
$object->description = $description;
|
||||||
@ -341,9 +338,6 @@ if (empty($reshook)) {
|
|||||||
sendMail($result, $cancreate, $now, $autoValidation);
|
sendMail($result, $cancreate, $now, $autoValidation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -493,7 +487,6 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
|
|||||||
|
|
||||||
|
|
||||||
if ($cancreate && !$cancreateall) {
|
if ($cancreate && !$cancreateall) {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
//$sql .= ' AND u.fk_user = '.$user->id;
|
//$sql .= ' AND u.fk_user = '.$user->id;
|
||||||
//$sql .= ' OR u.rowid ='.$user->id;
|
//$sql .= ' OR u.rowid ='.$user->id;
|
||||||
@ -646,7 +639,8 @@ if (is_object($db)) {
|
|||||||
* @return string|void
|
* @return string|void
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
function sendMail ($id, $cancreate, $now, $autoValidation){
|
function sendMail($id, $cancreate, $now, $autoValidation)
|
||||||
|
{
|
||||||
|
|
||||||
global $db, $user, $conf, $langs;
|
global $db, $user, $conf, $langs;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user