|
|
|
|
@ -27,6 +27,7 @@
|
|
|
|
|
require '../main.inc.php';
|
|
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
|
|
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
|
|
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
|
|
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
|
|
|
|
|
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
|
|
|
|
|
require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
|
|
|
|
|
@ -40,16 +41,19 @@ $langs->loadLangs(array('users', 'holidays', 'hrm'));
|
|
|
|
|
// Protection if external user
|
|
|
|
|
if ($user->societe_id > 0) accessforbidden();
|
|
|
|
|
|
|
|
|
|
$action = GETPOST('action', 'alpha'); // The action 'add', 'create', 'edit', 'update', 'view', ...
|
|
|
|
|
$action = GETPOST('action', 'aZ09'); // The action 'add', 'create', 'edit', 'update', 'view', ...
|
|
|
|
|
$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
|
|
|
|
|
$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
|
|
|
|
|
$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
|
|
|
|
|
$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
|
|
|
|
|
$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
|
|
|
|
|
$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'myobjectlist'; // To manage different context of search
|
|
|
|
|
$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'holidaylist'; // To manage different context of search
|
|
|
|
|
|
|
|
|
|
$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
|
|
|
|
|
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
|
|
|
|
|
|
|
|
|
|
$id = GETPOST('id', 'int');
|
|
|
|
|
|
|
|
|
|
$childids = $user->getAllChildIds(1);
|
|
|
|
|
|
|
|
|
|
// Security check
|
|
|
|
|
@ -59,8 +63,7 @@ if ($user->societe_id > 0) // Protection if external user
|
|
|
|
|
//$socid = $user->societe_id;
|
|
|
|
|
accessforbidden();
|
|
|
|
|
}
|
|
|
|
|
$result = restrictedArea($user, 'holiday', $id, '');
|
|
|
|
|
$id = GETPOST('id', 'int');
|
|
|
|
|
$result = restrictedArea($user, 'holiday', '', '');
|
|
|
|
|
// If we are on the view of a specific user
|
|
|
|
|
if ($id > 0)
|
|
|
|
|
{
|
|
|
|
|
@ -74,6 +77,9 @@ if ($id > 0)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$diroutputmassaction=$conf->holiday->dir_output . '/temp/massgeneration/'.$user->id;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Load variable for pagination
|
|
|
|
|
$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
|
|
|
|
|
$sortfield = GETPOST('sortfield', 'alpha');
|
|
|
|
|
@ -83,20 +89,8 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
|
|
|
|
|
$offset = $limit * $page;
|
|
|
|
|
$pageprev = $page - 1;
|
|
|
|
|
$pagenext = $page + 1;
|
|
|
|
|
|
|
|
|
|
// Initialize technical objects
|
|
|
|
|
$object=new Holiday($db);
|
|
|
|
|
$extrafields = new ExtraFields($db);
|
|
|
|
|
$diroutputmassaction=$conf->holiday->dir_output . '/temp/massgeneration/'.$user->id;
|
|
|
|
|
$hookmanager->initHooks(array('holidaylist')); // Note that conf->hooks_modules contains array
|
|
|
|
|
// Fetch optionals attributes and labels
|
|
|
|
|
$extralabels = $extrafields->fetch_name_optionals_label('holiday');
|
|
|
|
|
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
|
|
|
|
|
|
|
|
|
|
// Default sort order (if not yet defined by previous GETPOST)
|
|
|
|
|
if (! $sortfield) $sortfield="cp.rowid";
|
|
|
|
|
if (! $sortorder) $sortorder="DESC";
|
|
|
|
|
|
|
|
|
|
if (!$sortorder) $sortorder="DESC";
|
|
|
|
|
if (!$sortfield) $sortfield="cp.rowid";
|
|
|
|
|
|
|
|
|
|
$sall = trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
|
|
|
|
|
$search_ref = GETPOST('search_ref', 'alphanohtml');
|
|
|
|
|
@ -114,13 +108,47 @@ $search_valideur = GETPOST('search_valideur', 'int');
|
|
|
|
|
$search_statut = GETPOST('search_statut', 'int');
|
|
|
|
|
$search_type = GETPOST('search_type', 'int');
|
|
|
|
|
|
|
|
|
|
// Initialize technical objects
|
|
|
|
|
$object=new Holiday($db);
|
|
|
|
|
$extrafields = new ExtraFields($db);
|
|
|
|
|
$hookmanager->initHooks(array('holidaylist')); // Note that conf->hooks_modules contains array
|
|
|
|
|
|
|
|
|
|
// Fetch optionals attributes and labels
|
|
|
|
|
$extralabels = $extrafields->fetch_name_optionals_label('holiday');
|
|
|
|
|
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
|
|
|
|
|
|
|
|
|
|
// List of fields to search into when doing a "search in all"
|
|
|
|
|
$fieldstosearchall = array(
|
|
|
|
|
'cp.description'=>'Description',
|
|
|
|
|
'uu.lastname'=>'EmployeeLastname',
|
|
|
|
|
'uu.firstname'=>'EmployeeFirstname'
|
|
|
|
|
'uu.firstname'=>'EmployeeFirstname',
|
|
|
|
|
'uu.login'=>'Login'
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
$arrayfields=array(
|
|
|
|
|
'cp.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
|
|
|
|
|
'cp.fk_user'=>array('label'=>$langs->trans("Employee"), 'checked'=>1, 'position'=>20),
|
|
|
|
|
'cp.fk_validator'=>array('label'=>$langs->trans("ValidatorCP"), 'checked'=>1, 'position'=>30),
|
|
|
|
|
'cp.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1, 'position'=>35),
|
|
|
|
|
'duration'=>array('label'=>$langs->trans("NbUseDaysCPShort"), 'checked'=>1, 'position'=>38),
|
|
|
|
|
'cp.date_debut'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>40),
|
|
|
|
|
'cp.date_fin'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1, 'position'=>42),
|
|
|
|
|
'cp.date_valid'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1, 'position'=>60),
|
|
|
|
|
'cp.date_approve'=>array('label'=>$langs->trans("DateApprove"), 'checked'=>1, 'position'=>70),
|
|
|
|
|
'cp.date_create'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
|
|
|
|
|
'cp.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>501),
|
|
|
|
|
'cp.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
|
|
|
|
|
);
|
|
|
|
|
// Extra fields
|
|
|
|
|
if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
|
|
|
|
|
{
|
|
|
|
|
foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
|
|
|
|
|
{
|
|
|
|
|
if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
|
|
|
|
|
$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
@ -130,7 +158,7 @@ $fieldstosearchall = array(
|
|
|
|
|
if (GETPOST('cancel', 'alpha')) { $action='list'; $massaction=''; }
|
|
|
|
|
if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
|
|
|
|
|
|
|
|
|
|
$parameters=array();
|
|
|
|
|
$parameters=array('socid'=>$socid);
|
|
|
|
|
$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');
|
|
|
|
|
|
|
|
|
|
@ -180,19 +208,20 @@ if (empty($reshook))
|
|
|
|
|
|
|
|
|
|
$form = new Form($db);
|
|
|
|
|
$formother = new FormOther($db);
|
|
|
|
|
$formfile = new FormFile($db);
|
|
|
|
|
|
|
|
|
|
$holiday = new Holiday($db);
|
|
|
|
|
$holidaystatic=new Holiday($db);
|
|
|
|
|
$fuser = new User($db);
|
|
|
|
|
|
|
|
|
|
// Update sold
|
|
|
|
|
$result = $holiday->updateBalance();
|
|
|
|
|
$result = $object->updateBalance();
|
|
|
|
|
|
|
|
|
|
$max_year = 5;
|
|
|
|
|
$min_year = 10;
|
|
|
|
|
$filter='';
|
|
|
|
|
|
|
|
|
|
llxHeader('', $langs->trans('CPTitreMenu'));
|
|
|
|
|
$title = $langs->trans('CPTitreMenu');
|
|
|
|
|
llxHeader('', $title);
|
|
|
|
|
|
|
|
|
|
$order = $db->order($sortfield, $sortorder).$db->plimit($limit + 1, $offset);
|
|
|
|
|
|
|
|
|
|
@ -231,6 +260,16 @@ if (!empty($sall))
|
|
|
|
|
|
|
|
|
|
if (empty($user->rights->holiday->read_all)) $filter.=' AND cp.fk_user IN ('.join(',', $childids).')';
|
|
|
|
|
|
|
|
|
|
$sql='';
|
|
|
|
|
// Add where from extra fields
|
|
|
|
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
|
|
|
|
|
// Add where from hooks
|
|
|
|
|
$parameters=array();
|
|
|
|
|
$reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
|
|
$sql.=$hookmanager->resPrint;
|
|
|
|
|
|
|
|
|
|
$filter.=$sql;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Récupération de l'ID de l'utilisateur
|
|
|
|
|
$user_id = $user->id;
|
|
|
|
|
@ -246,29 +285,29 @@ if ($id > 0)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Récupération des congés payés de l'utilisateur ou de tous les users de sa hierarchy
|
|
|
|
|
// Load array $holiday->holiday
|
|
|
|
|
// Load array $object->holiday
|
|
|
|
|
if (empty($user->rights->holiday->read_all) || $id > 0)
|
|
|
|
|
{
|
|
|
|
|
if ($id > 0) $result = $holiday->fetchByUser($id, $order, $filter);
|
|
|
|
|
else $result = $holiday->fetchByUser(join(',', $childids), $order, $filter);
|
|
|
|
|
if ($id > 0) $result = $object->fetchByUser($id, $order, $filter);
|
|
|
|
|
else $result = $object->fetchByUser(join(',', $childids), $order, $filter);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
$result = $holiday->fetchAll($order, $filter);
|
|
|
|
|
$result = $object->fetchAll($order, $filter);
|
|
|
|
|
}
|
|
|
|
|
// Si erreur SQL
|
|
|
|
|
if ($result == '-1')
|
|
|
|
|
{
|
|
|
|
|
print load_fiche_titre($langs->trans('CPTitreMenu'), '', 'title_hrm.png');
|
|
|
|
|
|
|
|
|
|
dol_print_error($db, $langs->trans('Error').' '.$holiday->error);
|
|
|
|
|
dol_print_error($db, $langs->trans('Error').' '.$object->error);
|
|
|
|
|
exit();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Show table of vacations
|
|
|
|
|
|
|
|
|
|
$num = count($holiday->holiday);
|
|
|
|
|
$num = count($object->holiday);
|
|
|
|
|
|
|
|
|
|
$arrayofselected=is_array($toselect)?$toselect:array();
|
|
|
|
|
|
|
|
|
|
@ -280,7 +319,7 @@ if ($search_ref) $param.='&search_ref='.urlencode($search_ref);
|
|
|
|
|
if ($search_day_create) $param.='&search_day_create='.urlencode($search_day_create);
|
|
|
|
|
if ($search_month_create) $param.='&search_month_create='.urlencode($search_month_create);
|
|
|
|
|
if ($search_year_create) $param.='&search_year_create='.urlencode($search_year_create);
|
|
|
|
|
if ($search_search_day_start) $param.='&search_day_start='.urlencode($search_day_start);
|
|
|
|
|
if ($search_day_start) $param.='&search_day_start='.urlencode($search_day_start);
|
|
|
|
|
if ($search_month_start) $param.='&search_month_start='.urlencode($search_month_start);
|
|
|
|
|
if ($search_year_start) $param.='&search_year_start='.urlencode($search_year_start);
|
|
|
|
|
if ($search_day_end) $param.='&search_day_end='.urlencode($search_day_end);
|
|
|
|
|
@ -290,19 +329,23 @@ if ($search_employee > 0) $param.='&search_employee='.urlencode($search_employee
|
|
|
|
|
if ($search_valideur > 0) $param.='&search_valideur='.urlencode($search_valideur);
|
|
|
|
|
if ($search_type > 0) $param.='&search_type='.urlencode($search_type);
|
|
|
|
|
if ($search_statut > 0) $param.='&search_statut='.urlencode($search_statut);
|
|
|
|
|
// Add $param from extra fields
|
|
|
|
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
|
|
|
|
|
|
|
|
|
|
// List of mass actions available
|
|
|
|
|
$arrayofmassactions = array(
|
|
|
|
|
//'presend'=>$langs->trans("SendByMail"),
|
|
|
|
|
//'builddoc'=>$langs->trans("PDFMerge"),
|
|
|
|
|
//'generate_doc'=>$langs->trans("ReGeneratePDF"),
|
|
|
|
|
//'builddoc'=>$langs->trans("PDFMerge"),
|
|
|
|
|
//'presend'=>$langs->trans("SendByMail"),
|
|
|
|
|
);
|
|
|
|
|
if ($user->rights->holiday->delete) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
|
|
|
|
|
if ($user->rights->holiday->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
|
|
|
|
|
if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
|
|
|
|
|
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
|
|
|
|
|
|
|
|
|
|
print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
|
|
|
|
|
if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
|
|
|
|
|
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
|
|
|
|
print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
|
|
|
|
|
print '<input type="hidden" name="action" value="list">';
|
|
|
|
|
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
|
|
|
|
|
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
|
|
|
|
|
@ -326,7 +369,7 @@ if ($id > 0) // For user tab
|
|
|
|
|
|
|
|
|
|
print '<br>';
|
|
|
|
|
|
|
|
|
|
showMyBalance($holiday, $user_id);
|
|
|
|
|
showMyBalance($object, $user_id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dol_fiche_end();
|
|
|
|
|
@ -346,9 +389,11 @@ if ($id > 0) // For user tab
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
$nbtotalofrecords = count($holiday->holiday);
|
|
|
|
|
$nbtotalofrecords = count($object->holiday);
|
|
|
|
|
//print $num;
|
|
|
|
|
//print count($holiday->holiday);
|
|
|
|
|
//print count($object->holiday);
|
|
|
|
|
|
|
|
|
|
$title = $langs->trans("ListeCP");
|
|
|
|
|
|
|
|
|
|
$newcardbutton='';
|
|
|
|
|
if ($user->rights->holiday->write)
|
|
|
|
|
@ -356,7 +401,7 @@ else
|
|
|
|
|
$newcardbutton.= dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=request');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm.png', 0, $newcardbutton, '', $limit);
|
|
|
|
|
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm.png', 0, $newcardbutton, '', $limit);
|
|
|
|
|
|
|
|
|
|
$topicmail="Information";
|
|
|
|
|
$modelmail="leaverequest";
|
|
|
|
|
@ -371,126 +416,184 @@ if ($sall)
|
|
|
|
|
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall).'</div>';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$moreforfilter='';
|
|
|
|
|
|
|
|
|
|
$parameters=array();
|
|
|
|
|
$reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
|
|
if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
|
|
|
|
|
else $moreforfilter = $hookmanager->resPrint;
|
|
|
|
|
|
|
|
|
|
if (! empty($moreforfilter))
|
|
|
|
|
{
|
|
|
|
|
print '<div class="liste_titre liste_titre_bydiv centpercent">';
|
|
|
|
|
print $moreforfilter;
|
|
|
|
|
print '</div>';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
|
|
|
|
|
$selectedfields=''; // $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
|
|
|
|
|
$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
|
|
|
|
|
$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
|
|
|
|
|
$selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$include = '';
|
|
|
|
|
if (! empty($user->rights->holiday->read_all)) $include = 'hierarchyme'; // Can see all
|
|
|
|
|
|
|
|
|
|
print '<div class="div-table-responsive">';
|
|
|
|
|
print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Filters
|
|
|
|
|
print '<tr class="liste_titre_filter">';
|
|
|
|
|
print '<td class="liste_titre">';
|
|
|
|
|
print '<input class="flat" size="4" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
|
|
|
|
print '</td>';
|
|
|
|
|
|
|
|
|
|
// Create date
|
|
|
|
|
print '<td class="liste_titre center">';
|
|
|
|
|
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_create" value="'.dol_escape_htmltag($search_month_create).'">';
|
|
|
|
|
$formother->select_year($search_year_create, 'search_year_create', 1, $min_year, 0);
|
|
|
|
|
print '</td>';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$morefilter = 'AND employee = 1';
|
|
|
|
|
if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
|
|
|
|
|
|
|
|
|
|
// User
|
|
|
|
|
$disabled=0;
|
|
|
|
|
// If into the tab holiday of a user ($id is set in such a case)
|
|
|
|
|
if ($id && ! GETPOSTISSET('search_employee'))
|
|
|
|
|
if (! empty($arrayfields['cp.ref']['checked']))
|
|
|
|
|
{
|
|
|
|
|
$search_employee=$id;
|
|
|
|
|
$disabled=1;
|
|
|
|
|
print '<td class="liste_titre">';
|
|
|
|
|
print '<input class="flat" size="4" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
|
|
|
|
print '</td>';
|
|
|
|
|
}
|
|
|
|
|
if (! empty($user->rights->holiday->read_all)) // Can see all
|
|
|
|
|
|
|
|
|
|
if (! empty($arrayfields['cp.fk_user']['checked']))
|
|
|
|
|
{
|
|
|
|
|
if (GETPOSTISSET('search_employee')) $search_employee=GETPOST('search_employee', 'int');
|
|
|
|
|
$morefilter = 'AND employee = 1';
|
|
|
|
|
if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
|
|
|
|
|
|
|
|
|
|
// User
|
|
|
|
|
$disabled=0;
|
|
|
|
|
// If into the tab holiday of a user ($id is set in such a case)
|
|
|
|
|
if ($id && ! GETPOSTISSET('search_employee'))
|
|
|
|
|
{
|
|
|
|
|
$search_employee=$id;
|
|
|
|
|
$disabled=1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
print '<td class="liste_titre maxwidthonsmartphone left">';
|
|
|
|
|
print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, '', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
|
|
|
|
|
print '</td>';
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (GETPOSTISSET('search_employee')) $search_employee=GETPOST('search_employee', 'int');
|
|
|
|
|
print '<td class="liste_titre maxwidthonsmartphone left">';
|
|
|
|
|
print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, 'hierarchyme', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
|
|
|
|
|
print '</td>';
|
|
|
|
|
print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
|
|
|
|
|
print '</td>';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Approve
|
|
|
|
|
if ($user->rights->holiday->read_all)
|
|
|
|
|
// Approver
|
|
|
|
|
if (! empty($arrayfields['cp.fk_validator']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="liste_titre maxwidthonsmartphone left">';
|
|
|
|
|
|
|
|
|
|
$validator = new UserGroup($db);
|
|
|
|
|
$excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
|
|
|
|
|
$valideurobjects = $validator->listUsersForGroup($excludefilter);
|
|
|
|
|
$valideurarray = array();
|
|
|
|
|
foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
|
|
|
|
|
print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
|
|
|
|
|
print '</td>';
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
print '<td class="liste_titre"> </td>';
|
|
|
|
|
if ($user->rights->holiday->read_all)
|
|
|
|
|
{
|
|
|
|
|
print '<td class="liste_titre maxwidthonsmartphone left">';
|
|
|
|
|
$validator = new UserGroup($db);
|
|
|
|
|
$excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
|
|
|
|
|
$valideurobjects = $validator->listUsersForGroup($excludefilter);
|
|
|
|
|
$valideurarray = array();
|
|
|
|
|
foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
|
|
|
|
|
print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
|
|
|
|
|
print '</td>';
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
print '<td class="liste_titre"> </td>';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Type
|
|
|
|
|
print '<td class="liste_titre">';
|
|
|
|
|
if (empty($mysoc->country_id)) {
|
|
|
|
|
setEventMessages(null, array($langs->trans("ErrorSetACountryFirst"),$langs->trans("CompanyFoundation")), 'errors');
|
|
|
|
|
} else {
|
|
|
|
|
$typeleaves=$holidaystatic->getTypes(1, -1);
|
|
|
|
|
$arraytypeleaves=array();
|
|
|
|
|
foreach($typeleaves as $key => $val)
|
|
|
|
|
{
|
|
|
|
|
$labeltoshow = ($langs->trans($val['code'])!=$val['code'] ? $langs->trans($val['code']) : $val['label']);
|
|
|
|
|
//$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
|
|
|
|
|
$arraytypeleaves[$val['rowid']]=$labeltoshow;
|
|
|
|
|
if (! empty($arrayfields['cp.fk_type']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="liste_titre">';
|
|
|
|
|
if (empty($mysoc->country_id)) {
|
|
|
|
|
setEventMessages(null, array($langs->trans("ErrorSetACountryFirst"),$langs->trans("CompanyFoundation")), 'errors');
|
|
|
|
|
} else {
|
|
|
|
|
$typeleaves=$holidaystatic->getTypes(1, -1);
|
|
|
|
|
$arraytypeleaves=array();
|
|
|
|
|
foreach($typeleaves as $key => $val)
|
|
|
|
|
{
|
|
|
|
|
$labeltoshow = ($langs->trans($val['code'])!=$val['code'] ? $langs->trans($val['code']) : $val['label']);
|
|
|
|
|
//$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
|
|
|
|
|
$arraytypeleaves[$val['rowid']]=$labeltoshow;
|
|
|
|
|
}
|
|
|
|
|
print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1);
|
|
|
|
|
}
|
|
|
|
|
print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1);
|
|
|
|
|
print '</td>';
|
|
|
|
|
}
|
|
|
|
|
print '</td>';
|
|
|
|
|
|
|
|
|
|
// Duration
|
|
|
|
|
print '<td class="liste_titre"> </td>';
|
|
|
|
|
if (! empty($arrayfields['duration']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="liste_titre"> </td>';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Start date
|
|
|
|
|
print '<td class="liste_titre center">';
|
|
|
|
|
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_start" value="'.dol_escape_htmltag($search_month_start).'">';
|
|
|
|
|
$formother->select_year($search_year_start, 'search_year_start', 1, $min_year, $max_year);
|
|
|
|
|
print '</td>';
|
|
|
|
|
if (! empty($arrayfields['cp.date_debut']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="liste_titre center">';
|
|
|
|
|
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_start" value="'.dol_escape_htmltag($search_month_start).'">';
|
|
|
|
|
$formother->select_year($search_year_start, 'search_year_start', 1, $min_year, $max_year);
|
|
|
|
|
print '</td>';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// End date
|
|
|
|
|
print '<td class="liste_titre center">';
|
|
|
|
|
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_end" value="'.dol_escape_htmltag($search_month_end).'">';
|
|
|
|
|
$formother->select_year($search_year_end, 'search_year_end', 1, $min_year, $max_year);
|
|
|
|
|
print '</td>';
|
|
|
|
|
if (! empty($arrayfields['cp.date_fin']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="liste_titre center">';
|
|
|
|
|
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_end" value="'.dol_escape_htmltag($search_month_end).'">';
|
|
|
|
|
$formother->select_year($search_year_end, 'search_year_end', 1, $min_year, $max_year);
|
|
|
|
|
print '</td>';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Extra fields
|
|
|
|
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
|
|
|
|
|
// Fields from hook
|
|
|
|
|
$parameters=array('arrayfields'=>$arrayfields);
|
|
|
|
|
$reshook=$hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
|
|
print $hookmanager->resPrint;
|
|
|
|
|
|
|
|
|
|
// Create date
|
|
|
|
|
if (! empty($arrayfields['cp.date_create']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="liste_titre center">';
|
|
|
|
|
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_create" value="'.dol_escape_htmltag($search_month_create).'">';
|
|
|
|
|
$formother->select_year($search_year_create, 'search_year_create', 1, $min_year, 0);
|
|
|
|
|
print '</td>';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Create date
|
|
|
|
|
if (! empty($arrayfields['cp.tms']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="liste_titre center">';
|
|
|
|
|
print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month_update" value="'.dol_escape_htmltag($search_month_update).'">';
|
|
|
|
|
$formother->select_year($search_year_update, 'search_year_update', 1, $min_year, 0);
|
|
|
|
|
print '</td>';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Status
|
|
|
|
|
print '<td class="liste_titre maxwidthonsmartphone maxwidth200 right">';
|
|
|
|
|
$holiday->selectStatutCP($search_statut, 'search_statut');
|
|
|
|
|
print '</td>';
|
|
|
|
|
if (! empty($arrayfields['cp.statut']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="liste_titre maxwidthonsmartphone maxwidth200 right">';
|
|
|
|
|
$object->selectStatutCP($search_statut, 'search_statut');
|
|
|
|
|
print '</td>';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Actions
|
|
|
|
|
print '<td class="liste_titre maxwidthsearch">';
|
|
|
|
|
$searchpicto=$form->showFilterAndCheckAddButtons(0);
|
|
|
|
|
$searchpicto=$form->showFilterButtons();
|
|
|
|
|
print $searchpicto;
|
|
|
|
|
print '</td>';
|
|
|
|
|
|
|
|
|
|
print "</tr>\n";
|
|
|
|
|
|
|
|
|
|
print '<tr class="liste_titre">';
|
|
|
|
|
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "cp.ref", "", $param, '', $sortfield, $sortorder);
|
|
|
|
|
print_liste_field_titre("DateCreateCP", $_SERVER["PHP_SELF"], "cp.date_create", "", $param, '', $sortfield, $sortorder, 'center ');
|
|
|
|
|
print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "cp.fk_user", "", $param, '', $sortfield, $sortorder);
|
|
|
|
|
print_liste_field_titre("ValidatorCP", $_SERVER["PHP_SELF"], "cp.fk_validator", "", $param, '', $sortfield, $sortorder);
|
|
|
|
|
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
|
|
|
|
|
print_liste_field_titre("NbUseDaysCPShort", $_SERVER["PHP_SELF"], '', '', $pram, '', $sortfield, $sortorder, 'right ');
|
|
|
|
|
print_liste_field_titre("DateDebCP", $_SERVER["PHP_SELF"], "cp.date_debut", "", $param, '', $sortfield, $sortorder, 'center ');
|
|
|
|
|
print_liste_field_titre("DateFinCP", $_SERVER["PHP_SELF"], "cp.date_fin", "", $param, '', $sortfield, $sortorder, 'center ');
|
|
|
|
|
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cp.statut", "", $param, '', $sortfield, $sortorder, 'right ');
|
|
|
|
|
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
|
|
|
|
if (! empty($arrayfields['cp.ref']['checked'])) print_liste_field_titre($arrayfields['cp.ref']['label'], $_SERVER["PHP_SELF"], "cp.ref", "", $param, '', $sortfield, $sortorder);
|
|
|
|
|
if (! empty($arrayfields['cp.fk_user']['checked'])) print_liste_field_titre($arrayfields['cp.fk_user']['label'], $_SERVER["PHP_SELF"], "cp.fk_user", "", $param, '', $sortfield, $sortorder);
|
|
|
|
|
if (! empty($arrayfields['cp.fk_validator']['checked'])) print_liste_field_titre($arrayfields['cp.fk_validator']['label'], $_SERVER["PHP_SELF"], "cp.fk_validator", "", $param, '', $sortfield, $sortorder);
|
|
|
|
|
if (! empty($arrayfields['cp.fk_type']['checked'])) print_liste_field_titre($arrayfields['cp.fk_type']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
|
|
|
|
|
if (! empty($arrayfields['duration']['checked'])) print_liste_field_titre($arrayfields['duration']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
|
|
|
|
|
if (! empty($arrayfields['cp.date_debut']['checked'])) print_liste_field_titre($arrayfields['cp.date_debut']['label'], $_SERVER["PHP_SELF"], "cp.date_debut", "", $param, '', $sortfield, $sortorder, 'center ');
|
|
|
|
|
if (! empty($arrayfields['cp.date_fin']['checked'])) print_liste_field_titre($arrayfields['cp.date_fin']['label'], $_SERVER["PHP_SELF"], "cp.date_fin", "", $param, '', $sortfield, $sortorder, 'center ');
|
|
|
|
|
// Extra fields
|
|
|
|
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
|
|
|
|
|
// Hook fields
|
|
|
|
|
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
|
|
|
|
|
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
|
|
print $hookmanager->resPrint;
|
|
|
|
|
if (! empty($arrayfields['cp.date_create']['checked'])) print_liste_field_titre($arrayfields['cp.date_create']['label'], $_SERVER["PHP_SELF"], "cp.date_create", "", $param, '', $sortfield, $sortorder, 'center ');
|
|
|
|
|
if (! empty($arrayfields['cp.tms']['checked'])) print_liste_field_titre($arrayfields['cp.tms']['label'], $_SERVER["PHP_SELF"], "cp.tms", "", $param, '', $sortfield, $sortorder, 'center ');
|
|
|
|
|
if (! empty($arrayfields['cp.statut']['checked'])) print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cp.statut", "", $param, '', $sortfield, $sortorder, 'right ');
|
|
|
|
|
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
|
|
|
|
|
print "</tr>\n";
|
|
|
|
|
|
|
|
|
|
$listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon"));
|
|
|
|
|
@ -502,15 +605,17 @@ if ($id && empty($user->rights->holiday->read_all) && ! in_array($id, $childids)
|
|
|
|
|
print '<tr class="oddeven opacitymediuem"><td colspan="10">'.$langs->trans("NotEnoughPermissions").'</td></tr>';
|
|
|
|
|
$result = 0;
|
|
|
|
|
}
|
|
|
|
|
elseif (! empty($holiday->holiday) && !empty($mysoc->country_id))
|
|
|
|
|
elseif (! empty($object->holiday) && !empty($mysoc->country_id))
|
|
|
|
|
{
|
|
|
|
|
// Lines
|
|
|
|
|
$userstatic = new User($db);
|
|
|
|
|
$approbatorstatic = new User($db);
|
|
|
|
|
|
|
|
|
|
$typeleaves=$holiday->getTypes(1, -1);
|
|
|
|
|
$typeleaves=$object->getTypes(1, -1);
|
|
|
|
|
|
|
|
|
|
foreach($holiday->holiday as $infos_CP)
|
|
|
|
|
$i = 0;
|
|
|
|
|
$totalarray=array();
|
|
|
|
|
foreach($object->holiday as $infos_CP)
|
|
|
|
|
{
|
|
|
|
|
// Leave request
|
|
|
|
|
$holidaystatic->id=$infos_CP['rowid'];
|
|
|
|
|
@ -533,34 +638,86 @@ elseif (! empty($holiday->holiday) && !empty($mysoc->country_id))
|
|
|
|
|
$approbatorstatic->photo=$infos_CP['validator_photo'];
|
|
|
|
|
|
|
|
|
|
$date = $infos_CP['date_create'];
|
|
|
|
|
$date_modif = $infos_CP['date_update'];
|
|
|
|
|
|
|
|
|
|
$starthalfday=($infos_CP['halfday'] == -1 || $infos_CP['halfday'] == 2)?'afternoon':'morning';
|
|
|
|
|
$endhalfday=($infos_CP['halfday'] == 1 || $infos_CP['halfday'] == 2)?'morning':'afternoon';
|
|
|
|
|
|
|
|
|
|
print '<tr class="oddeven">';
|
|
|
|
|
print '<td>';
|
|
|
|
|
print $holidaystatic->getNomUrl(1, 1);
|
|
|
|
|
print '</td>';
|
|
|
|
|
print '<td style="text-align: center;">'.dol_print_date($date, 'day').'</td>';
|
|
|
|
|
print '<td>'.$userstatic->getNomUrl(-1, 'leave').'</td>';
|
|
|
|
|
print '<td>'.$approbatorstatic->getNomUrl(-1).'</td>';
|
|
|
|
|
print '<td>';
|
|
|
|
|
$labeltypeleavetoshow = ($langs->trans($typeleaves[$infos_CP['fk_type']]['code'])!=$typeleaves[$infos_CP['fk_type']]['code'] ? $langs->trans($typeleaves[$infos_CP['fk_type']]['code']) : $typeleaves[$infos_CP['fk_type']]['label']);
|
|
|
|
|
print empty($typeleaves[$infos_CP['fk_type']]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $infos_CP['fk_type']) : $labeltypeleavetoshow;
|
|
|
|
|
print '</td>';
|
|
|
|
|
print '<td class="right">';
|
|
|
|
|
$nbopenedday=num_open_day($infos_CP['date_debut_gmt'], $infos_CP['date_fin_gmt'], 0, 1, $infos_CP['halfday']);
|
|
|
|
|
print $nbopenedday.' '.$langs->trans('DurationDays');
|
|
|
|
|
print '</td>';
|
|
|
|
|
print '<td class="center">';
|
|
|
|
|
print dol_print_date($infos_CP['date_debut'], 'day');
|
|
|
|
|
print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
|
|
|
|
|
print '</td>';
|
|
|
|
|
print '<td class="center">';
|
|
|
|
|
print dol_print_date($infos_CP['date_fin'], 'day');
|
|
|
|
|
print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
|
|
|
|
|
print '</td>';
|
|
|
|
|
print '<td class="right">'.$holidaystatic->LibStatut($infos_CP['statut'], 5).'</td>';
|
|
|
|
|
|
|
|
|
|
if (! empty($arrayfields['cp.ref']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td>';
|
|
|
|
|
print $holidaystatic->getNomUrl(1, 1);
|
|
|
|
|
print '</td>';
|
|
|
|
|
if (! $i) $totalarray['nbfield']++;
|
|
|
|
|
}
|
|
|
|
|
if (! empty($arrayfields['cp.fk_user']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td>'.$userstatic->getNomUrl(-1, 'leave').'</td>';
|
|
|
|
|
if (! $i) $totalarray['nbfield']++;
|
|
|
|
|
}
|
|
|
|
|
if (! empty($arrayfields['cp.fk_validator']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td>'.$approbatorstatic->getNomUrl(-1).'</td>';
|
|
|
|
|
if (! $i) $totalarray['nbfield']++;
|
|
|
|
|
}
|
|
|
|
|
if (! empty($arrayfields['cp.fk_type']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td>';
|
|
|
|
|
$labeltypeleavetoshow = ($langs->trans($typeleaves[$infos_CP['fk_type']]['code'])!=$typeleaves[$infos_CP['fk_type']]['code'] ? $langs->trans($typeleaves[$infos_CP['fk_type']]['code']) : $typeleaves[$infos_CP['fk_type']]['label']);
|
|
|
|
|
print empty($typeleaves[$infos_CP['fk_type']]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $infos_CP['fk_type']) : $labeltypeleavetoshow;
|
|
|
|
|
print '</td>';
|
|
|
|
|
if (! $i) $totalarray['nbfield']++;
|
|
|
|
|
}
|
|
|
|
|
if (! empty($arrayfields['duration']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="right">';
|
|
|
|
|
$nbopenedday=num_open_day($infos_CP['date_debut_gmt'], $infos_CP['date_fin_gmt'], 0, 1, $infos_CP['halfday']);
|
|
|
|
|
print $nbopenedday.' '.$langs->trans('DurationDays');
|
|
|
|
|
print '</td>';
|
|
|
|
|
if (! $i) $totalarray['nbfield']++;
|
|
|
|
|
}
|
|
|
|
|
if (! empty($arrayfields['cp.date_debut']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="center">';
|
|
|
|
|
print dol_print_date($infos_CP['date_debut'], 'day');
|
|
|
|
|
print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
|
|
|
|
|
print '</td>';
|
|
|
|
|
if (! $i) $totalarray['nbfield']++;
|
|
|
|
|
}
|
|
|
|
|
if (! empty($arrayfields['cp.date_fin']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="center">';
|
|
|
|
|
print dol_print_date($infos_CP['date_fin'], 'day');
|
|
|
|
|
print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
|
|
|
|
|
print '</td>';
|
|
|
|
|
if (! $i) $totalarray['nbfield']++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Extra fields
|
|
|
|
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
|
|
|
|
|
// Fields from hook
|
|
|
|
|
$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
|
|
|
|
|
$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
|
|
|
|
|
print $hookmanager->resPrint;
|
|
|
|
|
|
|
|
|
|
// Date creation
|
|
|
|
|
if (! empty($arrayfields['cp.date_create']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td style="text-align: center;">'.dol_print_date($date, 'day').'</td>';
|
|
|
|
|
if (! $i) $totalarray['nbfield']++;
|
|
|
|
|
}
|
|
|
|
|
if (! empty($arrayfields['cp.tms']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td style="text-align: center;">'.dol_print_date($date_modif, 'day').'</td>';
|
|
|
|
|
if (! $i) $totalarray['nbfield']++;
|
|
|
|
|
}
|
|
|
|
|
if (! empty($arrayfields['cp.statut']['checked']))
|
|
|
|
|
{
|
|
|
|
|
print '<td class="right nowrap">'.$holidaystatic->LibStatut($infos_CP['statut'], 5).'</td>';
|
|
|
|
|
if (! $i) $totalarray['nbfield']++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Action column
|
|
|
|
|
print '<td class="nowrap center">';
|
|
|
|
|
@ -571,8 +728,11 @@ elseif (! empty($holiday->holiday) && !empty($mysoc->country_id))
|
|
|
|
|
print '<input id="cb'.$infos_CP['rowid'].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$infos_CP['rowid'].'"'.($selected?' checked="checked"':'').'>';
|
|
|
|
|
}
|
|
|
|
|
print '</td>';
|
|
|
|
|
if (! $i) $totalarray['nbfield']++;
|
|
|
|
|
|
|
|
|
|
print '</tr>'."\n";
|
|
|
|
|
|
|
|
|
|
$i++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
Laurent Destailleur