diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 722b78e3f7d..072ef4d76f8 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -233,6 +233,12 @@ if ($resql) print ''; 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 ''; print ''; diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/includes/modules/modAgenda.class.php index dfaa5432876..fd64bdc2776 100644 --- a/htdocs/includes/modules/modAgenda.class.php +++ b/htdocs/includes/modules/modAgenda.class.php @@ -134,7 +134,7 @@ class modAgenda extends DolibarrModules //------ $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++; // Exports diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php index 0a3687a0d4b..67ca987d6d9 100644 --- a/htdocs/lib/agenda.lib.php +++ b/htdocs/lib/agenda.lib.php @@ -86,11 +86,13 @@ function show_array_actions_to_do($max=5) print ''.$customerstatic->getNomUrl(1,'',16).''; // Date - print ''.dolibarr_print_date($obj->dp).' '; - if (date("U",$obj->dp) < time()) - { - print img_warning($langs->trans("Late")); - } + 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 ""; // Statut