lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look: Modifications esthtiques mineures

Browse Source
This commit is contained in:
Laurent Destailleur 2005-09-18 18:22:38 +00:00
parent 3e90501dc7
commit 5c25b56d5b
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/comm/action/index.php
View File

@ -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 = "SELECT s.nom as societe, s.idp as socidp, s.client,";
$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.= " a.id,".$db->pdate("a.datea")." as da, a.fk_contact, a.note, a.percent as percent,";
$sql .= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid"; $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"]) if ($_GET["type"])
{ {
$sql .= " AND c.id = ".$_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=\"20\">" .strftime("%d",$obj->da)."</td>\n";
print "<td width=\"30\">" .strftime("%H:%M",$obj->da)."</td>\n"; print "<td width=\"30\">" .strftime("%H:%M",$obj->da)."</td>\n";
// Status/Percent
if ($obj->percent < 100) { if ($obj->percent < 100) {
print "<td align=\"center\">".$obj->percent."%</td>"; print "<td align=\"center\">".$obj->percent."%</td>";
} }
@ -153,13 +156,14 @@ if ($resql)
print "<td align=\"center\">".$langs->trans("Done")."</td>"; 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); $transcode=$langs->trans("Action".$obj->acode);
$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle); $libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
print dolibarr_trunc($libelle,16); print dolibarr_trunc($libelle,16);
print '</a></td>'; print '</a></td>';
// Sociét // Société
print '<td>'; print '<td>';
if ($obj->client == 1) $url=DOL_URL_ROOT.'/comm/fiche.php?socid='; 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='; 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>'; print '<td>'.dolibarr_trunc($obj->note, 16).'</td>';
// Auteur // 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"; print "</tr>\n";
$i++; $i++;

12
htdocs/comm/fiche.php
View File

@ -724,7 +724,8 @@ if ($_socid > 0)
print '<td width="20">'.strftime("%d",$obj->da)."</td>\n"; print '<td width="20">'.strftime("%d",$obj->da)."</td>\n";
print '<td width="30">'.strftime("%H:%M",$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) if ($obj->propalrowid)
{ {
@ -752,7 +753,7 @@ if ($_socid > 0)
print '<td>&nbsp;</td>'; 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"; print "</tr>\n";
$i++; $i++;
} }
@ -817,7 +818,8 @@ if ($_socid > 0)
print '<td width="20">'.strftime("%d",$obj->da)."</td>\n"; print '<td width="20">'.strftime("%d",$obj->da)."</td>\n";
print '<td width="30">'.strftime("%H:%M",$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) if ($obj->propalrowid)
{ {
@ -841,14 +843,14 @@ if ($_socid > 0)
{ {
$contact = new Contact($db); $contact = new Contact($db);
$contact->fetch($obj->fk_contact); $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 else
{ {
print '<td>&nbsp;</td>'; 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"; print "</tr>\n";
$i++; $i++;
} }