From 26793c5e188f590df814a4a87ceb4c270463e6db Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Thu, 1 Apr 2004 11:04:38 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20du=20commentaires=20sur=20les=20derni?=
 =?UTF-8?q?=E8res=20actions=20effectu=E9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/prospect/fiche.php | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index 68bc9236f4e..e6667fb0424 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -364,12 +364,12 @@ if ($socid > 0)
        *      Listes des actions effectuees
        *
        */
-	      $sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, 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 ";
-	      $sql .= " WHERE a.fk_soc = $societe->id ";
-	      $sql .= " AND u.rowid = a.fk_user_author";
-	      $sql .= " AND c.id=a.fk_action AND a.percent = 100";
-	      $sql .= " ORDER BY a.datea DESC, a.id DESC";
+      $sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid, a.note ";
+      $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u ";
+      $sql .= " WHERE a.fk_soc = $societe->id ";
+      $sql .= " AND u.rowid = a.fk_user_author";
+      $sql .= " AND c.id=a.fk_action AND a.percent = 100";
+      $sql .= " ORDER BY a.datea DESC, a.id DESC";
       if ( $db->query($sql) )
 	{
 
@@ -379,16 +379,12 @@ if ($socid > 0)
 	  if ($num)
 	    {
 
-	      print '<table width="100%" cellspacing=0 border=0 cellpadding=2>';
+	      print '<table width="100%" cellspacing="0" border="0" cellpadding="2">';
 	      print '<tr class="liste_titre"><td><a href="action/index.php?socid='.$socid.'">Actions effectuées</a></td></tr>';
 	      print '<tr>';
 	      print '<td valign="top">';
-	      
-
-	      
-	      print '<table width="100%" cellspacing="0" border="0" cellpadding="2">';
-	      
-	      
+	      	      
+	      print '<table width="100%" cellspacing="0" border="0" cellpadding="1">';
 	      
 	      $oldyear='';
 	      $oldmonth='';
@@ -453,6 +449,15 @@ if ($socid > 0)
 		   */
 		  print '<td width="20%"><a href="../user/fiche.php?id='.$obj->fk_user_author.'">'.$obj->code.'</a></td>';
 		  print "</tr>\n";
+
+		  if ($i < 2 && strlen($obj->note))
+		    {
+		      print "<tr $bc[$var]>";
+		      print '<td colspan="5">&nbsp;</td><td colspan="3">';
+		      print stripslashes(nl2br($obj->note));
+		      print '</td></tr>';
+		    }
+
 		  $i++;
 		}
 	      print "</table>";