From 75d9e950c262b0a9d429dada7636ae61a4004864 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@destailleur.fr> Date: Mon, 23 Jun 2014 10:10:18 +0200 Subject: [PATCH] Fix: Another column visible when it shouldn't (field has been removed and is no more updated by dolibarr). --- htdocs/comm/action/listactions.php | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) 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 @@ <?php /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2003 Eric Seigne <erics@rycks.com> - * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * * 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 "</tr>\n"; @@ -270,11 +254,7 @@ if ($resql) print $actionstatic->getNomUrl(1,28); print '</td>'; - // Titre - //print '<td>'; - //print dol_trunc($obj->label,12); - //print '</td>'; - + // Start date print '<td align="center" class="nowrap">'; 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 '</td>'; + // End date print '<td align="center" class="nowrap">'; print dol_print_date($db->jdate($obj->dp2),"day"); print '</td>'; @@ -341,6 +322,7 @@ if ($resql) print '</td>'; // User did + /* print '<td align="left">'; if ($obj->useriddone) { @@ -351,6 +333,7 @@ if ($resql) } else print ' '; print '</td>'; + */ // Status/Percent print '<td align="right" class="nowrap">'.$actionstatic->LibStatut($obj->percent,6).'</td>'; -- GitLab