From 5c25b56d5b7a54a721bb428c98b45b52deb96301 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 18 Sep 2005 18:22:38 +0000
Subject: [PATCH] =?UTF-8?q?Look:=20Modifications=20esth=E9tiques=20mineure?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/action/index.php | 16 ++++++++++------
 htdocs/comm/fiche.php        | 12 +++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index cd8be29c11e..15c9ac93713 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -64,9 +64,11 @@ llxHeader();
  *
  */
 
-$sql = "SELECT s.nom as societe, s.idp as socidp, s.client, a.id,".$db->pdate("a.datea")." as da, c.code as acode, c.libelle, u.code, a.fk_contact, a.note, a.percent as percent";
-$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."user as u";
-$sql .= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid";
+$sql = "SELECT s.nom as societe, s.idp as socidp, s.client,";
+$sql.= " a.id,".$db->pdate("a.datea")." as da, a.fk_contact, a.note, a.percent as percent,";
+$sql.= " c.code as acode, c.libelle, u.code, u.rowid as userid";
+$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."user as u";
+$sql.= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid";
 if ($_GET["type"])
 {
   $sql .= " AND c.id = ".$_GET["type"];
@@ -146,6 +148,7 @@ if ($resql)
         print "<td width=\"20\">" .strftime("%d",$obj->da)."</td>\n";
         print "<td width=\"30\">" .strftime("%H:%M",$obj->da)."</td>\n";
 
+        // Status/Percent
         if ($obj->percent < 100) {
             print "<td align=\"center\">".$obj->percent."%</td>";
         }
@@ -153,13 +156,14 @@ if ($resql)
             print "<td align=\"center\">".$langs->trans("Done")."</td>";
         }
 
-        print '<td><a href="fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task").' ';
+        // Action
+        print '<td><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowTask"),"task").' ';
         $transcode=$langs->trans("Action".$obj->acode);
         $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
         print dolibarr_trunc($libelle,16);
         print '</a></td>';
 
-        // Sociét
+        // Société
         print '<td>';
         if ($obj->client == 1) $url=DOL_URL_ROOT.'/comm/fiche.php?socid=';
         elseif ($obj->client == 2) $url=DOL_URL_ROOT.'/comm/prospect/fiche.php?id=';
@@ -184,7 +188,7 @@ if ($resql)
         print '<td>'.dolibarr_trunc($obj->note, 16).'</td>';
 
         // Auteur
-        print '<td align="center">'.$obj->code.'</td>';
+        print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->code.'</a></td>';
 
         print "</tr>\n";
         $i++;
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index ea9b1fa0444..8dfaa05a97e 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -724,7 +724,8 @@ if ($_socid > 0)
                 print '<td width="20">'.strftime("%d",$obj->da)."</td>\n";
                 print '<td width="30">'.strftime("%H:%M",$obj->da)."</td>\n";
 
-                print '<td>&nbsp;</td>';
+                // Status/Percent
+                print '<td width="30">&nbsp;</td>';
 
                 if ($obj->propalrowid)
                 {
@@ -752,7 +753,7 @@ if ($_socid > 0)
                     print '<td>&nbsp;</td>';
                 }
 
-                print '<td><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->fk_user_author.'">'.$obj->code.'</a></td>';
+                print '<td width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->fk_user_author.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->code.'</a></td>';
                 print "</tr>\n";
                 $i++;
             }
@@ -817,7 +818,8 @@ if ($_socid > 0)
                 print '<td width="20">'.strftime("%d",$obj->da)."</td>\n";
                 print '<td width="30">'.strftime("%H:%M",$obj->da)."</td>\n";
 
-                print '<td>&nbsp;</td>';
+                // Statut/Percent
+                print '<td width="30">&nbsp;</td>';
 
                 if ($obj->propalrowid)
                 {
@@ -841,14 +843,14 @@ if ($_socid > 0)
                 {
                     $contact = new Contact($db);
                     $contact->fetch($obj->fk_contact);
-                    print '<td><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$contact->id.'">'.img_object($langs->trans("Showcontact"),"contact").' '.$contact->fullname.'</a></td>';
+                    print '<td><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$contact->id.'">'.img_object($langs->trans("ShowContact"),"contact").' '.$contact->fullname.'</a></td>';
                 }
                 else
                 {
                     print '<td>&nbsp;</td>';
                 }
 
-                print '<td><a href="../user/fiche.php?id='.$obj->fk_user_author.'">'.$obj->code.'</a></td>';
+                print '<td width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->fk_user_author.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->code.'</a></td>';
                 print "</tr>\n";
                 $i++;
             }