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

Suite module action/agenda

Browse Source
This commit is contained in:
Laurent Destailleur 2008-03-02 19:01:22 +00:00
parent ee144f32c8
commit 6462c6229d
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,6 +233,12 @@ if ($resql)
print '<td align="left" nowrap="nowrap">'; print '<td align="left" nowrap="nowrap">';
print dolibarr_print_date($obj->dp,"day"); print dolibarr_print_date($obj->dp,"day");
$late=0;
if ($obj->percent == 0 && $obj->dp && date("U",$obj->dp) < time()) $late=1;
if ($obj->percent == 0 && ! $obj->dp && $obj->dp2 && date("U",$obj->dp) < time()) $late=1;
if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && date("U",$obj->dp2) < time()) $late=1;
if ($obj->percent > 0 && $obj->percent < 100 && ! $obj->dp2 && $obj->dp && date("U",$obj->dp) < time()) $late=1;
if ($late) print img_warning($langs->trans("Late"));
print '</td>'; print '</td>';
print '<td align="left" nowrap="nowrap">'; print '<td align="left" nowrap="nowrap">';

2
htdocs/includes/modules/modAgenda.class.php
View File

@ -134,7 +134,7 @@ class modAgenda extends DolibarrModules
//------ //------
$r=0; $r=0;
$this->menu[$r]=array('fk_menu'=>0,'type'=>'top','titre'=>'Agenda','mainmenu'=>'agenda','leftmenu'=>'agenda','url'=>'/comm/action/index.php','langs'=>'commercial','position'=>100,'perms'=>'$user->rights->agenda->myactions->read','target'=>'','user'=>0); $this->menu[$r]=array('fk_menu'=>0,'type'=>'top','titre'=>'Agenda','mainmenu'=>'agenda','leftmenu'=>'agenda','url'=>'/comm/action/indexactions.php','langs'=>'commercial','position'=>100,'perms'=>'$user->rights->agenda->myactions->read','target'=>'','user'=>0);
$r++; $r++;
// Exports // Exports

12
htdocs/lib/agenda.lib.php
View File

@ -86,11 +86,13 @@ function show_array_actions_to_do($max=5)
print '<td>'.$customerstatic->getNomUrl(1,'',16).'</td>'; print '<td>'.$customerstatic->getNomUrl(1,'',16).'</td>';
// Date // Date
print '<td width="100">'.dolibarr_print_date($obj->dp).'&nbsp;'; print '<td width="100" alig="right">'.dolibarr_print_date($obj->dp,'day').'&nbsp;';
if (date("U",$obj->dp) < time()) $late=0;
{ if ($obj->percent == 0 && $obj->dp && date("U",$obj->dp) < time()) $late=1;
print img_warning($langs->trans("Late")); if ($obj->percent == 0 && ! $obj->dp && $obj->dp2 && date("U",$obj->dp) < time()) $late=1;
} if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && date("U",$obj->dp2) < time()) $late=1;
if ($obj->percent > 0 && $obj->percent < 100 && ! $obj->dp2 && $obj->dp && date("U",$obj->dp) < time()) $late=1;
if ($late) print img_warning($langs->trans("Late"));
print "</td>"; print "</td>";
// Statut // Statut