diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php index 191fb34d2e8..866399ef1cc 100644 --- a/htdocs/compta/hrm.php +++ b/htdocs/compta/hrm.php @@ -71,26 +71,6 @@ print_fiche_titre($langs->trans("HRMArea")); print '
'; - -if (! empty($conf->holiday->enabled)) -{ - $user_id = $user->id; - - $nbaquis=$holiday->getCPforUser($user_id); - $nbdeduced=$holiday->getConfCP('nbHolidayDeducted'); - $nb_holiday = $nbaquis / $nbdeduced; - - print ''; - print ''; - print ""; - print ''; - print ''; - print '
'.$langs->trans("Holidays").'
'; - print $langs->trans('SoldeCPUser',round($nb_holiday,2)).($nbdeduced != 1 ? ' ('.$nbaquis.' / '.$nbdeduced.')' : ''); - print '

'; -} - - /* * Search expenses */ @@ -124,6 +104,26 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire print "
"; } + +if (! empty($conf->holiday->enabled)) +{ + $user_id = $user->id; + + $nbaquis=$holiday->getCPforUser($user_id); + $nbdeduced=$holiday->getConfCP('nbHolidayDeducted'); + $nb_holiday = $nbaquis / $nbdeduced; + + print ''; + print ''; + print ""; + print ''; + print ''; + print '
'.$langs->trans("Holidays").'
'; + print $langs->trans('SoldeCPUser',round($nb_holiday,2)).($nbdeduced != 1 ? ' ('.$nbaquis.' / '.$nbdeduced.')' : ''); + print '

'; +} + + print '
'; $max=10;