浏览代码

HRM area : Show Ref instead of id for expense report

aspangaro 10 年之前
父节点
当前提交
cb36a919b5
共有 2 个文件被更改,包括 3 次插入4 次删除
  1. 2 4
      htdocs/compta/hrm.php
  2. 1 0
      htdocs/langs/en_US/trips.lang

+ 2 - 4
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 '<tr '.$bc[$var].'>';
-				print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
+				print '<td><a href="../expensereport/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->ref.'</a></td>';
 				print '<td>'.$userstatic->getNomUrl(1).'</td>';
 				print '<td align="right">'.price($obj->total_ttc).'</td>';
 				print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';

+ 1 - 0
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