diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index ca52f98bbe3..7fdf0fa87a7 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -63,8 +63,9 @@ llxHeader(); */ $sql = "SELECT s.nom as societe, s.idp as socid, s.client,"; -$sql.= " a.id,".$db->pdate("a.datep")." as dp, a.fk_contact, a.note, a.percent as percent,"; -$sql.= " c.code as acode, c.libelle, u.code, u.rowid as userid"; +$sql.= " a.id,".$db->pdate("a.datep")." as dp, a.fk_contact, a.note, a.label, a.percent as percent,"; +$sql.= " c.code as acode, c.libelle,"; +$sql.= " u.code, u.rowid as userid"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user"; $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"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -118,9 +119,9 @@ if ($resql) // print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.datep",$param,'','colspan="4"',$sortfield); print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.datep",$param,'','',$sortfield); print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"acode",$param,"","",$sortfield); + print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield); print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield); - print ''.$langs->trans("Comments").''; print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"],"u.code",$param,"","",$sortfield); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"","",$sortfield); print "\n"; @@ -166,13 +167,18 @@ if ($resql) // print ''.dolibarr_print_date($obj->dp)."\n"; - // Action + // Action (type) 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 ''; + // Titre + print ''; + print $obj->label; + print ''; + // Société print ''; if ($obj->client == 1) $url=DOL_URL_ROOT.'/comm/fiche.php?socid='; @@ -182,7 +188,7 @@ if ($resql) // Contact print ''; - if ($obj->fk_contact) + if ($obj->fk_contact > 0) { $cont = new Contact($db); $cont->fetch($obj->fk_contact); @@ -194,9 +200,6 @@ if ($resql) } print ''; - // Note - print ''.dolibarr_trunc($obj->note, 16).''; - // Auteur print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->code.'';