Modif look

This commit is contained in:
Rodolphe Quiedeville 2004-03-22 10:26:00 +00:00
parent 18956c6b2f
commit 2e9cf161d6

View File

@ -318,23 +318,31 @@ if ($socid > 0)
print '<td width="10%">&nbsp;</td>'; print '<td width="10%">&nbsp;</td>';
print '<td width="40%">';
if ($obj->propalrowid) if ($obj->propalrowid)
{ {
print '<td width="40%"><a href="../propal.php?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a></td>'; print '<a href="../propal.php?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a>';
} }
else else
{ {
print '<td width="40%"><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.$obj->libelle.'</a></td>'; print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_file().'</a> ';
print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.$obj->libelle.'</a>';
} }
print '</td>';
/* /*
* Contact pour cette action * Contact pour cette action
* *
*/ */
if ($obj->fk_contact) { if ($obj->fk_contact)
{
$contact = new Contact($db); $contact = new Contact($db);
$contact->fetch($obj->fk_contact); $contact->fetch($obj->fk_contact);
print '<td width="40%"><a href="people.php?socid='.$societe->id.'&contactid='.$contact->id.'">'.$contact->fullname.'</a></td>'; // print '<td width="40%"><a href="people.php?socid='.$societe->id.'&contactid='.$contact->id.'">'.$contact->fullname.'</a></td>';
} else { print '<td width="40%">'.$contact->fullname.'</td>';
}
else
{
print '<td width="40%">&nbsp;</td>'; print '<td width="40%">&nbsp;</td>';
} }
/* /*
@ -356,6 +364,16 @@ if ($socid > 0)
* Listes des actions effectuees * Listes des actions effectuees
* *
*/ */
if ( $db->query($sql) )
{
$i = 0 ;
$num = $db->num_rows();
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 class="liste_titre"><td><a href="action/index.php?socid='.$socid.'">Actions effectuées</a></td></tr>';
print '<tr>'; print '<tr>';
@ -368,12 +386,10 @@ if ($socid > 0)
$sql .= " AND c.id=a.fk_action AND a.percent = 100"; $sql .= " AND c.id=a.fk_action AND a.percent = 100";
$sql .= " ORDER BY a.datea DESC, a.id DESC"; $sql .= " ORDER BY a.datea DESC, a.id DESC";
if ( $db->query($sql) )
{
print '<table width="100%" cellspacing="0" border="0" cellpadding="2">'; print '<table width="100%" cellspacing="0" border="0" cellpadding="2">';
$i = 0 ;
$num = $db->num_rows();
$oldyear=''; $oldyear='';
$oldmonth=''; $oldmonth='';
while ($i < $num) while ($i < $num)
@ -408,13 +424,16 @@ if ($socid > 0)
print '<td width="10%">&nbsp;</td>'; print '<td width="10%">&nbsp;</td>';
print '<td width="40%">';
if ($obj->propalrowid) if ($obj->propalrowid)
{ {
print '<td width="40%"><a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a></td>'; print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.img_file().'</a> ';
print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->propalrowid.'">'.$obj->libelle.'</a></td>';
} }
else else
{ {
print '<td width="40%"><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.$obj->libelle.'</a></td>'; print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.img_file().'</a> ';
print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$obj->id.'">'.$obj->libelle.'</a></td>';
} }
/* /*
* Contact pour cette action * Contact pour cette action
@ -424,7 +443,7 @@ if ($socid > 0)
{ {
$contact = new Contact($db); $contact = new Contact($db);
$contact->fetch($obj->fk_contact); $contact->fetch($obj->fk_contact);
print '<td width="40%"><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$contact->id.'">'.$contact->fullname.'</a></td>'; print '<td width="40%">'.$contact->fullname.'</td>';
} }
else else
{ {
@ -437,14 +456,15 @@ if ($socid > 0)
$i++; $i++;
} }
print "</table>"; print "</table>";
print "</td></tr></table>";
}
$db->free(); $db->free();
} }
else else
{ {
print $db->error(); print $db->error();
} }
print "</td></tr></table>";
/* /*
* *
* Notes sur la societe * Notes sur la societe