lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Another column visible when it shouldn't (field has been removed

Browse Source 
and is no more updated by dolibarr).
This commit is contained in:
Laurent Destailleur 2014-06-23 10:10:18 +02:00
parent dae7f8643b
commit 75d9e950c2
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/comm/action/listactions.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Eric Seigne <erics@rycks.com> * 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> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 // Define list of all external calendars
$listofextcals=array(); $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=''; $param='';
if ($status) $param="&status=".$status; 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("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("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("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_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="right"',$sortfield,$sortorder);
print "</tr>\n"; print "</tr>\n";
@ -270,11 +254,7 @@ if ($resql)
print $actionstatic->getNomUrl(1,28); print $actionstatic->getNomUrl(1,28);
print '</td>'; print '</td>';
// Titre // Start date
//print '<td>';
//print dol_trunc($obj->label,12);
//print '</td>';
print '<td align="center" class="nowrap">'; print '<td align="center" class="nowrap">';
print dol_print_date($db->jdate($obj->dp),"day"); print dol_print_date($db->jdate($obj->dp),"day");
$late=0; $late=0;
@ -285,6 +265,7 @@ if ($resql)
if ($late) print img_warning($langs->trans("Late")).' '; if ($late) print img_warning($langs->trans("Late")).' ';
print '</td>'; print '</td>';
// End date
print '<td align="center" class="nowrap">'; print '<td align="center" class="nowrap">';
print dol_print_date($db->jdate($obj->dp2),"day"); print dol_print_date($db->jdate($obj->dp2),"day");
print '</td>'; print '</td>';
@ -341,6 +322,7 @@ if ($resql)
print '</td>'; print '</td>';
// User did // User did
/*
print '<td align="left">'; print '<td align="left">';
if ($obj->useriddone) if ($obj->useriddone)
{ {
@ -351,6 +333,7 @@ if ($resql)
} }
else print '&nbsp;'; else print '&nbsp;';
print '</td>'; print '</td>';
*/
// Status/Percent // Status/Percent
print '<td align="right" class="nowrap">'.$actionstatic->LibStatut($obj->percent,6).'</td>'; print '<td align="right" class="nowrap">'.$actionstatic->LibStatut($obj->percent,6).'</td>';