diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index e6944f4c829..48e21690d2a 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2004-2012 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -115,22 +115,6 @@ $form=new Form($db); // Define list of all external calendars $listofextcals=array(); -/*if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0) -{ - $i=0; - while($i < $conf->global->AGENDA_EXT_NB) - { - $i++; - $paramkey='AGENDA_EXT_SRC'.$i; - $url=$conf->global->$paramkey; - $paramkey='AGENDA_EXT_NAME'.$i; - $namecal = $conf->global->$paramkey; - $paramkey='AGENDA_EXT_COLOR'.$i; - $colorcal = $conf->global->$paramkey; - if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal); - } -} -*/ $param=''; if ($status) $param="&status=".$status; @@ -245,7 +229,7 @@ if ($resql) print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("ActionUserAsk"),$_SERVER["PHP_SELF"],"ua.login",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("AffectedTo"),$_SERVER["PHP_SELF"],"ut.login",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DoneBy"),$_SERVER["PHP_SELF"],"ud.login",$param,"","",$sortfield,$sortorder); + //print_liste_field_titre($langs->trans("DoneBy"),$_SERVER["PHP_SELF"],"ud.login",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="right"',$sortfield,$sortorder); print "\n"; @@ -270,11 +254,7 @@ if ($resql) print $actionstatic->getNomUrl(1,28); print ''; - // Titre - //print ''; - //print dol_trunc($obj->label,12); - //print ''; - + // Start date print ''; print dol_print_date($db->jdate($obj->dp),"day"); $late=0; @@ -285,6 +265,7 @@ if ($resql) if ($late) print img_warning($langs->trans("Late")).' '; print ''; + // End date print ''; print dol_print_date($db->jdate($obj->dp2),"day"); print ''; @@ -341,6 +322,7 @@ if ($resql) print ''; // User did + /* print ''; if ($obj->useriddone) { @@ -351,6 +333,7 @@ if ($resql) } else print ' '; print ''; + */ // Status/Percent print ''.$actionstatic->LibStatut($obj->percent,6).'';