Added DurationDays string to the table
This commit is contained in:
parent
8837caeb6f
commit
7dd457d2df
@ -289,11 +289,11 @@ if($user->rights->holiday->lire_tous)
|
|||||||
{
|
{
|
||||||
print '<td class="liste_titre" align="left">';
|
print '<td class="liste_titre" align="left">';
|
||||||
|
|
||||||
$validator = new UserGroup($db);
|
$validator = new UserGroup($db);
|
||||||
$excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
|
$excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
|
||||||
$valideurobjects = $validator->listUsersForGroup($excludefilter);
|
$valideurobjects = $validator->listUsersForGroup($excludefilter);
|
||||||
$valideurarray = array();
|
$valideurarray = array();
|
||||||
foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
|
foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
|
||||||
$form->select_users($search_valideur,"search_valideur",1,"",0,$valideurarray,'');
|
$form->select_users($search_valideur,"search_valideur",1,"",0,$valideurarray,'');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
@ -359,7 +359,7 @@ if (! empty($holiday->holiday))
|
|||||||
print '<td align="center">'.dol_print_date($infos_CP['date_fin'],'day').'</td>';
|
print '<td align="center">'.dol_print_date($infos_CP['date_fin'],'day').'</td>';
|
||||||
print '<td align="right">';
|
print '<td align="right">';
|
||||||
$nbopenedday=num_open_day($infos_CP['date_debut'], $infos_CP['date_fin'], 0, 1, $infos_CP['halfday']);
|
$nbopenedday=num_open_day($infos_CP['date_debut'], $infos_CP['date_fin'], 0, 1, $infos_CP['halfday']);
|
||||||
print $nbopenedday;
|
print $nbopenedday.' '.$langs->trans('DurationDays');
|
||||||
print '<td align="right">'.$holidaystatic->LibStatut($infos_CP['statut'],5).'</td>';
|
print '<td align="right">'.$holidaystatic->LibStatut($infos_CP['statut'],5).'</td>';
|
||||||
print '</tr>'."\n";
|
print '</tr>'."\n";
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user