diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index cd8be29c11e..15c9ac93713 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -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 .= " 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";
+$sql = "SELECT s.nom as societe, s.idp as socidp, s.client,";
+$sql.= " a.id,".$db->pdate("a.datea")." as da, a.fk_contact, a.note, a.percent as percent,";
+$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"])
{
$sql .= " AND c.id = ".$_GET["type"];
@@ -146,6 +148,7 @@ if ($resql)
print "
" .strftime("%d",$obj->da)." | \n";
print "" .strftime("%H:%M",$obj->da)." | \n";
+ // Status/Percent
if ($obj->percent < 100) {
print "".$obj->percent."% | ";
}
@@ -153,13 +156,14 @@ if ($resql)
print "".$langs->trans("Done")." | ";
}
- print ''.img_object($langs->trans("ShowTask"),"task").' ';
+ // Action
+ print ' | '.img_object($langs->trans("ShowTask"),"task").' ';
$transcode=$langs->trans("Action".$obj->acode);
$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
print dolibarr_trunc($libelle,16);
print ' | ';
- // Sociét
+ // Société
print '';
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=';
@@ -184,7 +188,7 @@ if ($resql)
print ' | '.dolibarr_trunc($obj->note, 16).' | ';
// Auteur
- print ''.$obj->code.' | ';
+ print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->code.' | ';
print "\n";
$i++;
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index ea9b1fa0444..8dfaa05a97e 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -724,7 +724,8 @@ if ($_socid > 0)
print ''.strftime("%d",$obj->da)." | \n";
print ''.strftime("%H:%M",$obj->da)." | \n";
- print ' | ';
+ // Status/Percent
+ print ' | ';
if ($obj->propalrowid)
{
@@ -752,7 +753,7 @@ if ($_socid > 0)
print ' | ';
}
- print ''.$obj->code.' | ';
+ print ''.img_object($langs->trans("ShowUser"),"user").' '.$obj->code.' | ';
print "\n";
$i++;
}
@@ -817,7 +818,8 @@ if ($_socid > 0)
print ''.strftime("%d",$obj->da)." | \n";
print ''.strftime("%H:%M",$obj->da)." | \n";
- print ' | ';
+ // Statut/Percent
+ print ' | ';
if ($obj->propalrowid)
{
@@ -841,14 +843,14 @@ if ($_socid > 0)
{
$contact = new Contact($db);
$contact->fetch($obj->fk_contact);
- print ''.img_object($langs->trans("Showcontact"),"contact").' '.$contact->fullname.' | ';
+ print ''.img_object($langs->trans("ShowContact"),"contact").' '.$contact->fullname.' | ';
}
else
{
print ' | ';
}
- print ''.$obj->code.' | ';
+ print ''.img_object($langs->trans("ShowUser"),"user").' '.$obj->code.' | ';
print "\n";
$i++;
}