diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php
index 6e7216332ea..e3a20662f5d 100644
--- a/htdocs/holiday/admin/holiday.php
+++ b/htdocs/holiday/admin/holiday.php
@@ -322,16 +322,18 @@ print ''."\n\n";
dol_fiche_end();
-/*$var=!$var;
-print $langs->trans('nbUserCP').': '."\n";
-print $cp->getConfCP('nbUser')."
\n";
+/*$var=!$var;
+print $langs->trans('nbUserCP').': '."\n";
+print $cp->getConfCP('nbUser')."
\n";
*/
-
-$var=!$var;
-print $langs->trans('LastUpdateCP').': '."\n";
-print dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser')."
\n";
-print '
';
+$var=!$var;
+print $langs->trans('LastUpdateCP').': '."\n";
+if ($cp->getConfCP('lastUpdate')) print dol_print_date($db->jdate($cp->getConfCP('lastUpdate')),'dayhour','tzuser');
+else print $langs->trans('None');
+print "
\n";
+
+print '
';
print_fiche_titre($langs->trans('TitleOptionEventCP'),'','');
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 15445162af3..55971e64375 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1151,7 +1151,7 @@ class Holiday extends CommonObject
$obj = $this->db->fetch_object($resql);
$tab_result[$i]['rowid'] = $obj->rowid;
- $tab_result[$i]['name'] = $obj->name;
+ $tab_result[$i]['name'] = $obj->lastname;
$tab_result[$i]['firstname'] = $obj->firstname;
$i++;
@@ -1191,7 +1191,7 @@ class Holiday extends CommonObject
$obj = $this->db->fetch_object($resql);
$tab_result[$i]['rowid'] = $obj->fk_user;
- $tab_result[$i]['name'] = $obj->name;
+ $tab_result[$i]['name'] = $obj->lastname;
$tab_result[$i]['firstname'] = $obj->firstname;
$i++;
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 940c8b9a8be..36e93d84271 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -145,8 +145,8 @@ print '';
print '
| '.$langs->trans('ID').' | '; -print ''.$langs->trans('UserName').' | '; -print ''.$langs->trans('Available').' | '; +print ''.$langs->trans('UserName').' | '; +print ''.$langs->trans('Available').' | '; print ''.$langs->trans('UpdateButtonCP').' | '; print ''.$users['rowid'].' | '; print ''; $userstatic->id=$users['rowid']; - $userstatic->lastname=$users['lastname']; + $userstatic->lastname=$users['name']; $userstatic->firstname=$users['firstname']; print $userstatic->getNomUrl(1); print ' | '; - print ''; + print ' | '; print ''; print ' '.$langs->trans('days').' | '."\n"; print ''."\n"; diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 06c75411453..8343a805081 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -289,11 +289,11 @@ if($user->rights->holiday->lire_tous) { print ' | '; - $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; + $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; $form->select_users($search_valideur,"search_valideur",1,"",0,$valideurarray,''); print ' | '; } @@ -359,7 +359,7 @@ if (! empty($holiday->holiday)) print ''.dol_print_date($infos_CP['date_fin'],'day').' | '; print ''; $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 ' | '.$holidaystatic->LibStatut($infos_CP['statut'],5).' | '; print ''."\n"; diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang index 250872e523e..614539960d5 100644 --- a/htdocs/langs/bg_BG/holiday.lang +++ b/htdocs/langs/bg_BG/holiday.lang @@ -21,7 +21,7 @@ DateDebCP=Начална дата DateFinCP=Крайна дата DateCreateCP=Дата на създаване DraftCP=Проект -ToApproveCP=Очаква одобрение +ToReviewCP=Очаква одобрение ApprovedCP=Утвърден CancelCP=Отменен RefuseCP=Отказ diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang index d77e31fbb7f..60adaa8faf3 100644 --- a/htdocs/langs/ca_ES/holiday.lang +++ b/htdocs/langs/ca_ES/holiday.lang @@ -15,13 +15,13 @@ DateDebCP=Data inici DateFinCP=Data fi DateCreateCP=Data de creació DraftCP=Esborrany -ToValidateCP=En espera de validació -ValidateCP=Validada +ToReviewCP=A l'espera d'aprovació +ApprvedCP=Aprovada CancelCP=Anul·lada RefuseCP=Rebutjada ValidatorCP=Validador ListeCP=Llista de vacances -ValidateByCP=Serà validada per +ReviewedByCP=Serà revisada per DescCP=Descripció SendRequestCP=Enviar la petició de vacances DelayToRequestCP=Les peticions de vacances s'han de fer almenys %s dies abans. diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index e2bf8d85209..5453b2b88e6 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -15,7 +15,7 @@ DateDebCP=Start date DateFinCP=End date DateCreateCP=Creation date DraftCP=Draft -ToApproveCP=Awaiting approval +ToReviewCP=Awaiting approval ApprovedCP=Approved CancelCP=Canceled RefuseCP=Refused diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index a4c5c786980..5c234575d25 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -15,7 +15,7 @@ DateDebCP=Fecha inicio DateFinCP=Fecha fin DateCreateCP=Fecha de creación DraftCP=Borrador -ToApproveCP=En espera de aprobación +ToReviewCP=En espera de aprobación ApprovedCP=Aprobada CancelCP=Anulada RefuseCP=Rechazada diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index 5b133dbba9e..938ffaa155d 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -15,7 +15,7 @@ DateDebCP=Date Début DateFinCP=Date Fin DateCreateCP=Date de création DraftCP=Brouillon -ToApproveCP=En attente d'approbation +ToReviewCP=En attente d'approbation ApprovedCP=Approuvé CancelCP=Annulée RefuseCP=Refusée