';
+ $include_users = $object->fetch_users_approver_holiday();
+ if (!in_array($object->fk_validator, $include_users)) // Add the current validator to the list to not lose it when editing.
+ {
+ $include_users[] = $object->fk_validator;
+ }
+ if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
+ else
+ {
+ $arrayofvalidatorstoexclude = (($user->admin || ($user->id != $userRequest->id)) ? '' : array($user->id)); // Nobody if we are admin or if we are not the user of the leave.
+ $s = $form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), $arrayofvalidatorstoexclude, 0, $include_users);
+ print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
+ }
+ if ($action == 'editvalidator')
+ {
+ print '';
+ print '';
+ }
+ print '
';
- llxFooter();
- exit();
-}
-
-
/*
* Actions
@@ -90,20 +79,20 @@
if (empty($reshook))
{
- // Selection of new fields
- include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
- // Purge search criteria
- if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
- {
- $search_name = '';
- $search_supervisor = '';
- $toselect = '';
- $search_array_options = array();
- }
-
- // Mass actions
- /*
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+ // Purge search criteria
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+ {
+ $search_name = '';
+ $search_supervisor = '';
+ $toselect = '';
+ $search_array_options = array();
+ }
+
+ // Mass actions
+ /*
$objectclass='Skeleton';
$objectlabel='Skeleton';
$permissiontoread = $user->rights->skeleton->read;
@@ -112,52 +101,52 @@
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
*/
- // Si il y a une action de mise à jour
- if ($action == 'update' && isset($_POST['update_cp']))
- {
- $error = 0;
-
- $typeleaves = $holiday->getTypes(1, 1);
-
- $userID = array_keys($_POST['update_cp']);
- $userID = $userID[0];
-
- foreach ($typeleaves as $key => $val)
- {
- $userValue = $_POST['nb_holiday_'.$val['rowid']];
- $userValue = $userValue[$userID];
-
- if (!empty($userValue) || (string) $userValue == '0')
- {
- $userValue = price2num($userValue, 5);
- } else {
- $userValue = '';
- }
-
- //If the user set a comment, we add it to the log comment
- $comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
-
- //print 'holiday: '.$val['rowid'].'-'.$userValue;
- if ($userValue != '')
- {
- // We add the modification to the log (must be before update of sold because we read current value of sold)
- $result = $holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
- if ($result < 0)
- {
- setEventMessages($holiday->error, $holiday->errors, 'errors');
- $error++;
- }
-
- // Update of the days of the employee
- $result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
- if ($result < 0)
- {
- setEventMessages($holiday->error, $holiday->errors, 'errors');
- $error++;
- }
-
- // If it first update of balance, we set date to avoid to have sold incremented by new month
- /*
+ // Si il y a une action de mise à jour
+ if ($action == 'update' && isset($_POST['update_cp']))
+ {
+ $error = 0;
+
+ $typeleaves = $holiday->getTypes(1, 1);
+
+ $userID = array_keys($_POST['update_cp']);
+ $userID = $userID[0];
+
+ foreach ($typeleaves as $key => $val)
+ {
+ $userValue = $_POST['nb_holiday_'.$val['rowid']];
+ $userValue = $userValue[$userID];
+
+ if (!empty($userValue) || (string) $userValue == '0')
+ {
+ $userValue = price2num($userValue, 5);
+ } else {
+ $userValue = '';
+ }
+
+ //If the user set a comment, we add it to the log comment
+ $comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
+
+ //print 'holiday: '.$val['rowid'].'-'.$userValue;
+ if ($userValue != '')
+ {
+ // We add the modification to the log (must be before update of sold because we read current value of sold)
+ $result = $holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
+ if ($result < 0)
+ {
+ setEventMessages($holiday->error, $holiday->errors, 'errors');
+ $error++;
+ }
+
+ // Update of the days of the employee
+ $result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
+ if ($result < 0)
+ {
+ setEventMessages($holiday->error, $holiday->errors, 'errors');
+ $error++;
+ }
+
+ // If it first update of balance, we set date to avoid to have sold incremented by new month
+ /*
$now=dol_now();
$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
$sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
@@ -165,11 +154,11 @@
dol_syslog('define_holiday update lastUpdate entry', LOG_DEBUG);
$result = $db->query($sql);
*/
- }
- }
-
- if (!$error) setEventMessages('UpdateConfCPOK', '', 'mesgs');
- }
+ }
+ }
+
+ if (!$error) setEventMessages('UpdateConfCPOK', '', 'mesgs');
+ }
}
@@ -205,10 +194,10 @@
print '
';
-
- $usersupervisor = new User($db);
-
- foreach ($listUsers as $users)
- {
- // If user has not permission to edit/read all, we must see only subordinates
- if (empty($user->rights->holiday->readall))
- {
- if (($users['rowid'] != $user->id) && (!in_array($users['rowid'], $userchilds))) continue; // This user is not into hierarchy of current user, we hide it.
- }
-
- $userstatic->id = $users['rowid'];
- $userstatic->lastname = $users['lastname'];
- $userstatic->firstname = $users['firstname'];
- $userstatic->gender = $users['gender'];
- $userstatic->photo = $users['photo'];
- $userstatic->statut = $users['status'];
- $userstatic->employee = $users['employee'];
- $userstatic->fk_user = $users['fk_user'];
-
- if ($userstatic->fk_user > 0) $usersupervisor->fetch($userstatic->fk_user);
-
- print '
';
+
+ $usersupervisor = new User($db);
+
+ foreach ($listUsers as $users)
+ {
+ // If user has not permission to edit/read all, we must see only subordinates
+ if (empty($user->rights->holiday->read_all))
+ {
+ if (($users['rowid'] != $user->id) && (!in_array($users['rowid'], $userchilds))) continue; // This user is not into hierarchy of current user, we hide it.
+ }
+
+ $userstatic->id = $users['rowid'];
+ $userstatic->lastname = $users['lastname'];
+ $userstatic->firstname = $users['firstname'];
+ $userstatic->gender = $users['gender'];
+ $userstatic->photo = $users['photo'];
+ $userstatic->statut = $users['status'];
+ $userstatic->employee = $users['employee'];
+ $userstatic->fk_user = $users['fk_user'];
+
+ if ($userstatic->fk_user > 0) $usersupervisor->fetch($userstatic->fk_user);
+
+ print '
';
}
$moreforfilter = '';
@@ -471,7 +475,7 @@
$include = '';
- if (empty($user->rights->holiday->readall)) $include = 'hierarchyme'; // Can see only its hierarchyl
+ if (empty($user->rights->holiday->read_all)) $include = 'hierarchyme'; // Can see only its hierarchyl
print '
';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- {
- $selected = 0;
+ {
+ $selected = 0;
if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
print '';
- }
+ }
print '
';
if (!$i) $totalarray['nbfield']++;
@@ -787,7 +793,9 @@
print '';
print '';
-} else {
+}
+else
+{
dol_print_error($db);
}
--- /tmp/dsg/dolibarr/htdocs/holiday/github_month_report.php
+++ /tmp/dsg/dolibarr/htdocs/holiday/client_month_report.php
@@ -2,7 +2,6 @@
/* Copyright (C) 2007-2010 Laurent Destailleur
* Copyright (C) 2011 François Legastelois
* Copyright (C) 2018-2019 Frédéric France
- * Copyright (C) 2020 Tobias Sekan
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -43,85 +42,13 @@
}
$result = restrictedArea($user, 'holiday', $id, '');
-$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
-$massaction = GETPOST('massaction', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ');
-$optioncss = GETPOST('optioncss', 'aZ');
-
-$search_ref = GETPOST('search_ref', 'alphanohtml');
-$search_employee = GETPOST('search_employee', 'int');
-$search_type = GETPOST('search_type', 'int');
-$search_description = GETPOST('search_description', 'alphanohtml');
-
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'alpha');
-
-if (!$sortfield) $sortfield = "cp.rowid";
-if (!$sortorder) $sortorder = "ASC";
-
-$hookmanager->initHooks(array('leavemovementlist'));
-
-$arrayfields = array();
-$arrayofmassactions = array();
-
-/*
- * Actions
- */
-
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
-
-$parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
- // Selection of new fields
- include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
- // Purge search criteria
- if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
- {
- $search_ref = '';
- $search_employee = '';
- $search_type = '';
- $search_description = '';
- $toselect = '';
- $search_array_options = array();
- }
-
- if (GETPOST('button_removefilter_x', 'alpha')
- || GETPOST('button_removefilter.x', 'alpha')
- || GETPOST('button_removefilter', 'alpha')
- || GETPOST('button_search_x', 'alpha')
- || GETPOST('button_search.x', 'alpha')
- || GETPOST('button_search', 'alpha'))
- {
- $massaction = '';
- }
-}
-
-$arrayfields = array(
- 'cp.ref'=>array('label'=>$langs->trans('Ref'), 'checked'=>1),
- 'cp.fk_user'=>array('label'=>$langs->trans('Employee'), 'checked'=>1),
- 'ct.label'=>array('label'=>$langs->trans('Type'), 'checked'=>1),
- 'cp.date_debut'=>array('label'=>$langs->trans('DateDebCP'), 'checked'=>1),
- 'cp.date_fin'=>array('label'=>$langs->trans('DateFinCP'), 'checked'=>1),
- 'used_days'=>array('label'=>$langs->trans('NbUseDaysCPShort'), 'checked'=>1),
- 'date_start_month'=>array('label'=>$langs->trans('DateStartInMonth'), 'checked'=>1),
- 'date_end_month'=>array('label'=>$langs->trans('DateEndInMonth'), 'checked'=>1),
- 'used_days_month'=>array('label'=>$langs->trans('NbUseDaysCPShortInMonth'), 'checked'=>1),
- 'cp.description'=>array('label'=>$langs->trans('DescCP'), 'checked'=>1),
-);
/*
* View
*/
-$form = new Form($db);
+$html = new Form($db);
$formother = new FormOther($db);
$holidaystatic = new Holiday($db);
@@ -129,24 +56,36 @@
llxHeader('', $langs->trans('CPTitreMenu'));
+print load_fiche_titre($langs->trans('MenuReportMonth'), '', 'title_hrm');
+
+
+// Selection filter
+print '