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

Fix list of leave request was not showing label correctly.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-01-23 11:17:20 +01:00
parent 2b96c8f205
commit 627f606c4d
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/holiday/list.php
View File

@ -35,10 +35,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
$langs->load('users'); $langs->load('users');
$langs->load('holidays'); $langs->load('holidays');
$langs->load('hrm');
// Protection if external user // Protection if external user
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha'); $sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha'); $sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int'); $page = GETPOST("page",'int');
@ -47,12 +49,13 @@ $page = $page == -1 ? 0 : $page;
if (! $sortfield) $sortfield="cp.rowid"; if (! $sortfield) $sortfield="cp.rowid";
if (! $sortorder) $sortorder="DESC"; if (! $sortorder) $sortorder="DESC";
$offset = $conf->liste_limit * $page ; $offset = $limit * $page ;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
$id = GETPOST('id','int'); $id = GETPOST('id','int');
$sall = GETPOST('sall');
$search_ref = GETPOST('search_ref'); $search_ref = GETPOST('search_ref');
$month_create = GETPOST('month_create'); $month_create = GETPOST('month_create');
$year_create = GETPOST('year_create'); $year_create = GETPOST('year_create');
@ -64,7 +67,7 @@ $search_employe = GETPOST('search_employe');
$search_valideur = GETPOST('search_valideur'); $search_valideur = GETPOST('search_valideur');
$search_statut = GETPOST('select_statut'); $search_statut = GETPOST('select_statut');
if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
{ {
$search_ref=""; $search_ref="";
$month_create=""; $month_create="";
@ -104,7 +107,7 @@ $filter='';
llxHeader(array(),$langs->trans('CPTitreMenu')); llxHeader(array(),$langs->trans('CPTitreMenu'));
$order = $db->order($sortfield,$sortorder).$db->plimit($conf->liste_limit + 1, $offset); $order = $db->order($sortfield,$sortorder).$db->plimit($limit + 1, $offset);
// WHERE // WHERE
if(!empty($search_ref)) if(!empty($search_ref))
@ -172,6 +175,7 @@ if(!empty($search_statut) && $search_statut != -1) {
$filter.= " AND cp.statut = '".$db->escape($search_statut)."'\n"; $filter.= " AND cp.statut = '".$db->escape($search_statut)."'\n";
} }
/************************************* /*************************************
* Fin des filtres de recherche * Fin des filtres de recherche
*************************************/ *************************************/
@ -207,7 +211,8 @@ if ($holiday_payes == '-1')
// Show table of vacations // Show table of vacations
$var=true; $num = count($holiday->holiday); $var=true;
$num = count($holiday->holiday);
$form = new Form($db); $form = new Form($db);
$formother = new FormOther($db); $formother = new FormOther($db);
@ -246,6 +251,7 @@ else
dol_fiche_head(''); dol_fiche_head('');
} }
$alltypeleaves=$holiday->getTypes(1,-1); // To have labels
$out=''; $out='';
$typeleaves=$holiday->getTypes(1,1); $typeleaves=$holiday->getTypes(1,1);
@ -388,7 +394,10 @@ if (! empty($holiday->holiday))
print '<td style="text-align: center;">'.dol_print_date($date,'day').'</td>'; print '<td style="text-align: center;">'.dol_print_date($date,'day').'</td>';
print '<td>'.$userstatic->getNomUrl('1').'</td>'; print '<td>'.$userstatic->getNomUrl('1').'</td>';
print '<td>'.$approbatorstatic->getNomUrl('1').'</td>'; print '<td>'.$approbatorstatic->getNomUrl('1').'</td>';
print '<td>'.$infos_CP['fk_type'].'</td>'; print '<td>';
$label=$alltypeleaves[$infos_CP['fk_type']]['label'];
print $label?$label:$infos_CP['fk_type'];
print '</td>';
print '<td align="right">'; print '<td align="right">';
$nbopenedday=num_open_day($infos_CP['date_debut_gmt'], $infos_CP['date_fin_gmt'], 0, 1, $infos_CP['halfday']); $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 $nbopenedday.' '.$langs->trans('DurationDays');