diff --git a/htdocs/user/list.php b/htdocs/user/list.php index a9abb53fafa..8e291e0b689 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -31,11 +31,6 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; -if (isModEnabled('category')) { - require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; -} - /** * @var Conf $conf * @var DoliDB $db @@ -43,6 +38,10 @@ if (isModEnabled('category')) { * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +if (isModEnabled('category')) { + require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; +} // Load translation files required by page $langs->loadLangs(array('users', 'companies', 'hrm', 'salaries')); @@ -153,6 +152,7 @@ $arrayfields = array( 'u.national_registration_number' => array('label' => "NationalRegistrationNumber", 'checked' => '-1', 'position' => 51, 'enabled' => (string) (int) (isModEnabled('hrm') && $permissiontoreadhr)), 'u.job' => array('label' => "PostOrFunction", 'checked' => '-1', 'position' => 60), 'u.salary' => array('label' => "Salary", 'checked' => '-1', 'position' => 80, 'enabled' => (string) (int) (isModEnabled('salaries') && $user->hasRight("salaries", "readall")), 'isameasure' => 1), + 'u.thm' => array('label' => "THM", 'langs' => 'salaries', 'checked' => '-1', 'position' => 82, 'enabled' => '1', 'isameasure' => 1), 'u.datec' => array('label' => "DateCreation", 'checked' => '0', 'position' => 500), 'date_modification' => array('label' => "DateModificationShort", 'checked' => '0', 'position' => 500), 'u.statut' => array('label' => "Status", 'checked' => '1', 'position' => 1000), @@ -389,7 +389,7 @@ $morehtmlright = ""; // -------------------------------------------------------------------- $sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.office_phone, u.user_mobile, u.email, u.api_key, u.accountancy_code, u.gender, u.employee, u.photo,"; $sql .= " u.fk_user,"; -$sql .= " u.ref_employee, u.national_registration_number, u.job, u.salary, u.datelastlogin, u.datepreviouslogin,"; +$sql .= " u.ref_employee, u.national_registration_number, u.job, u.salary, u.thm, u.datelastlogin, u.datepreviouslogin,"; $sql .= " u.datestartvalidity, u.dateendvalidity,"; $sql .= " u.ldap_sid, u.statut as status, u.entity,"; $sql .= " GREATEST(u.tms, ef.tms) as date_modification, u.datec as date_creation,"; @@ -844,6 +844,9 @@ if (!empty($arrayfields['u.job']['checked'])) { if (!empty($arrayfields['u.salary']['checked'])) { print '