From 920c5d7e4a58cb94b8e2d6ce03f471157f935e74 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 11 Mar 2006 01:49:55 +0000
Subject: [PATCH] =?UTF-8?q?Uniformisation=20code=20liste=20des=20actions?=
 =?UTF-8?q?=20=E0=20faire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/fiche.php | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 345609e7dec..3c38ab76be2 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -918,7 +918,7 @@ if ($socidp > 0)
          *      Listes des actions effectuees
          */
         print '<table class="noborder" width="100%">';
-        print '<tr class="liste_titre"><td colspan="10"><a href="action/index.php?socid='.$objsoc->id.'">'.$langs->trans("ActionsDone").'</a></td></tr>';
+        print '<tr class="liste_titre"><td colspan="11"><a href="action/index.php?socid='.$objsoc->id.'">'.$langs->trans("ActionsDone").'</a></td></tr>';
 
         $sql = "SELECT a.id, a.label, ".$db->pdate("a.datea")." as da, c.code as acode, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid ";
         $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u ";
@@ -967,27 +967,30 @@ if ($socidp > 0)
                 print '<td width="30">'.strftime("%H:%M",$obj->da)."</td>\n";
 				print "<td>&nbsp;</td>";
 
-                // Statut/Percent
+                // Espace
                 print '<td width="30">&nbsp;</td>';
 
-                if ($obj->propalrowid)
-                {
-                    print '<td><a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowAction"),"task");
-                      $transcode=$langs->trans("Action".$obj->acode);
-                      $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
-                      print $libelle;
-                    print '</a></td>';
-                }
-                else
-                {
-                    print '<td><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_object($langs->trans("ShowAction"),"task");
-                      $transcode=$langs->trans("Action".$obj->acode);
-                      $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
-                      print $libelle;
-                    print '</a></td>';
-                }
+				// Action
+        		print '<td>';
+				print '<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 $libelle;
+				print '</a>';
+				print '</td>';
+
+        		print '<td>';
+				if ($obj->propalrowid)
+				{
+					print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowPropal"),"propal");
+					print $langs->trans("Propal");
+					print '</a>';
+				}
+				else print '&nbsp;';
+        		print '</td>';
 
                 print "<td>$obj->label</td>";
+
                 // Contact pour cette action
                 if ($obj->fk_contact)
                 {
@@ -1000,7 +1003,7 @@ if ($socidp > 0)
                     print '<td>&nbsp;</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 '<td><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->code.'</a></td>';
                 print "</tr>\n";
                 $i++;
             }