From e03be4f6ed3c6fabf718b5dfee23b34c4b4795a2 Mon Sep 17 00:00:00 2001 From: aspangaro <alexandre.spangaro@gmail.com> Date: Sun, 27 Apr 2014 04:08:34 +0200 Subject: [PATCH] HRM Area - Typo & presentation --- htdocs/compta/hrm.php | 6 +++--- htdocs/langs/en_US/users.lang | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php index d6b0d345010..b50eade0cf4 100644 --- a/htdocs/compta/hrm.php +++ b/htdocs/compta/hrm.php @@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php'; $langs->load('users'); $langs->load('holidays'); -$langs->load('tripss'); +$langs->load('trips'); // Protection if external user if ($user->societe_id > 0) accessforbidden(); @@ -61,7 +61,7 @@ $holidaystatic=new Holiday($db); llxHeader(array(),$langs->trans('HRMArea')); - +print_fiche_titre($langs->trans("HRMArea")); print '<div class="fichecenter"><div class="fichethirdleft">'; @@ -106,11 +106,11 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire) print '</div><div class="fichetwothirdright"><div class="ficheaddleft">'; - $max=10; $langs->load("boxes"); +// Last trips $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.dated as date, d.tms as dm, d.km, d.fk_statut"; $sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc"; diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 06c595e6391..f5f0e3f89d5 100644 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - users +HRMArea=HRM area UserCard=User card ContactCard=Contact card GroupCard=Group card -- GitLab