diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index eeb44703048..40f2e5581ca 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -32,7 +32,6 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'; require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php'; $langs->load('users'); $langs->load('holidays'); @@ -230,17 +229,16 @@ if ($id > 0) { if ($mode == 'employee') // For HRM module development { - $head = employee_prepare_head($fuser); $title = $langs->trans("Employee"); $linkback = ''.$langs->trans("BackToList").''; } else { - $head = user_prepare_head($fuser); $title = $langs->trans("User"); $linkback = ''.$langs->trans("BackToList").''; } + $head = user_prepare_head($fuser); dol_fiche_head($head, 'paidholidays', $title, 0, 'user'); diff --git a/htdocs/hrm/class/employee.class.php b/htdocs/hrm/class/employee.class.php index 1a1350b3b63..42f940811a9 100644 --- a/htdocs/hrm/class/employee.class.php +++ b/htdocs/hrm/class/employee.class.php @@ -145,7 +145,7 @@ class Employee extends CommonObject $label.= '
'; } - $link.= 'global->MAIN_OPTIMIZEFORTEXTBROWSER)) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index ffd2f878adf..957344ccbf9 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -45,6 +45,7 @@ if (! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class $id = GETPOST('id','int'); $action = GETPOST('action','alpha'); +$mode = GETPOST('mode','alpha'); $confirm = GETPOST('confirm','alpha'); $subaction = GETPOST('subaction','alpha'); $group = GETPOST("group","int",3); @@ -1108,8 +1109,18 @@ else } // Show tabs + if ($mode == 'employee') // For HRM module development + { + $title = $langs->trans("Employee"); + $linkback = ''.$langs->trans("BackToList").''; + } + else + { + $title = $langs->trans("User"); + $linkback = ''.$langs->trans("BackToList").''; + } + $head = user_prepare_head($object); - $title = $langs->trans("User"); /* * Confirmation reinitialisation mot de passe @@ -1158,9 +1169,7 @@ else { dol_fiche_head($head, 'user', $title, 0, 'user'); - $linkback = ''.$langs->trans("BackToList").''; - - dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '