From cb36a919b540ea895fa33d0d3d99c3da0cebd908 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Fri, 26 Jun 2015 05:34:12 +0200 Subject: [PATCH] HRM area : Show Ref instead of id for expense report --- htdocs/compta/hrm.php | 6 ++---- htdocs/langs/en_US/trips.lang | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php index 4df30c023fc..f33e8bd3dd7 100644 --- a/htdocs/compta/hrm.php +++ b/htdocs/compta/hrm.php @@ -196,7 +196,7 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire) if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire) { - $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status"; + $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status"; $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".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"; $sql.= " WHERE u.rowid = x.fk_user_author"; @@ -231,13 +231,11 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire while ($i < $num && $i < $max) { $obj = $db->fetch_object($result); - $expensereportstatic->ref=$obj->rowid; - $expensereportstatic->id=$obj->rowid; $userstatic->id=$obj->uid; $userstatic->lastname=$obj->lastname; $userstatic->firstname=$obj->firstname; print ''; - print ''.$expensereportstatic->getNomUrl(1).''; + print ''.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->ref.''; print ''.$userstatic->getNomUrl(1).''; print ''.price($obj->total_ttc).''; print ''.dol_print_date($db->jdate($obj->dm),'day').''; diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index 969ceaa01d6..cc14a66aea5 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -9,6 +9,7 @@ TripCard=Expense report card AddTrip=Create expense report ListOfTrips=List of expense reports ListOfFees=List of fees +ShowTrip=Show expense report NewTrip=New expense report CompanyVisited=Company/foundation visited Kilometers=Kilometers