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 ''; + print '
'; print ''; print ''; print '
Actions effectuées
'; - - - - print ''; - - + + print '
'; $oldyear=''; $oldmonth=''; @@ -453,6 +449,15 @@ if ($socid > 0) */ print ''; print "\n"; + + if ($i < 2 && strlen($obj->note)) + { + print ""; + print ''; + } + $i++; } print "
'.$obj->code.'
 '; + print stripslashes(nl2br($obj->note)); + print '
";