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..3517fa1d11e 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -159,7 +159,7 @@ foreach($listUsers as $users) 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 '';