diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 5335f7b057a..5a7adf37c20 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -450,10 +450,9 @@ if ($_GET["id"]) $act = new ActionComm($db); $act->fetch($_GET["id"]); - - $act->societe->fetch($act->societe->id); - $act->author->fetch($act->author->id); - $act->contact->fetch($act->contact->id); + $res=$act->societe->fetch($act->societe->id); + $res=$act->author->fetch(); // Le paramètre est le login, hors seul l'id est chargé. + $res=$act->contact->fetch($act->contact->id); /* * Affichage onglets @@ -488,13 +487,14 @@ if ($_GET["id"]) print ''.$langs->trans("Type").''.$act->type.''; print ''.$langs->trans("Title").''.$act->label.''; print ''.$langs->trans("Company").''; - print ''.$act->societe->nom.''; + print ''.img_object($langs->trans("ShowCompany"),'company').' '.$act->societe->nom.''; print ''.$langs->trans("Contact").''; $html->select_array("contactid", $act->societe->contact_array(), $act->contact->id, 1); print ''; print ''.$langs->trans("DateCreation").''.strftime('%d %B %Y %H:%M',$act->date).''; - print ''.$langs->trans("Author").''.$act->author->fullname.''; + print ''.$langs->trans("Author").''; + print ''.img_object($langs->trans("ShowUser"),'user').' '.$act->author->fullname.''; print ''.$langs->trans("PercentDone").'%'; if ($act->objet_url) { @@ -510,36 +510,37 @@ if ($_GET["id"]) print ''; } else - { - // Affichage fiche action en mode visu - print ''; - print ''; - print ''; - print ''; - - print ''; - print ''; - print ''; - print ''; - print ''; - if ($act->objet_url) - { - print ''; - print ''; - } - - // Note - print ''; - - print '
'.$langs->trans("Type").''.$act->type.'
'.$langs->trans("Title").''.$act->label.'
'.$langs->trans("Company").''.$act->societe->nom_url.''.$langs->trans("Contact").''.$act->contact->fullname.'
'.$langs->trans("DateCreation").''.strftime('%d %B %Y %H:%M',$act->date).''.$langs->trans("Author").''.$act->author->fullname.'
'.$langs->trans("PercentDone").''.$act->percent.' %
'.$langs->trans("LinkedObject").''.$act->objet_url.'
'.$langs->trans("Note").''; - print nl2br($act->note).'
'; + { + // Affichage fiche action en mode visu + print ''; + print ''; + print ''; + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + if ($act->objet_url) + { + print ''; + print ''; + } + + // Note + print ''; + + print '
'.$langs->trans("Type").''.$act->type.'
'.$langs->trans("Title").''.$act->label.'
'.$langs->trans("Company").''.img_object($langs->trans("ShowCompany"),'company').' '.$act->societe->nom_url.''.$langs->trans("Contact").''.img_object($langs->trans("ShowContact"),'contact').' '.$act->contact->fullname.'
'.$langs->trans("DateCreation").''.strftime('%d %B %Y %H:%M',$act->date).''.$langs->trans("Author").''.img_object($langs->trans("ShowUser"),'user').' '.$act->author->fullname.'
'.$langs->trans("PercentDone").''.$act->percent.' %
'.$langs->trans("LinkedObject").''.$act->objet_url.'
'.$langs->trans("Note").''; + print nl2br($act->note).'
'; } print "\n"; - /* + /** * Barre d'actions * */