diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index ca782897407..d58edcf7de2 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -133,7 +133,20 @@ class modProjet extends DolibarrModules 3=>array('file'=>'box_validated_projects.php', 'enabledbydefaulton'=>'Home'), // task without timespent 4=>array('file'=>'box_funnel_of_prospection.php', 'enabledbydefaulton'=>'Home'), ); - + // Cronjobs + $this->cronjobs[] = array( + 'label' => 'WeeklyWorkingHoursReport', + 'jobtype' => 'method', + 'class' => 'projet/class/project.class.php', + 'objectname' => 'Project', + 'method' => 'createWeeklyReport', + 'parameters' => '', + 'comment' => 'Generates and sends a weekly report on time worked', + 'frequency' => 1, + 'unitfrequency' => 86400 * 7, + 'status' => 0, + 'test' => '$conf->projet->enabled', + ); // Permissions $this->rights = array(); $this->rights_class = 'projet'; diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index 34c90ca7173..b7b564e1441 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -144,7 +144,9 @@ if ($action == 'add' && $permissiontoadd) { $object->frequency = GETPOSTINT('nbfrequency'); $object->maxrun = GETPOSTINT('maxrun'); $object->email_alert = GETPOST('email_alert'); - + $object->status = 0; + $object->processing = 0; + $object->lastresult = ''; // Add cron task $result = $object->create($user); diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 34c633c2140..6ff0a53ed4a 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -1241,7 +1241,7 @@ class Task extends CommonObjectLine $sql .= " WHERE pt.rowid = ec.element_id"; } if ($userp && $filteronprojstatus > -1) { - $sql .= " AND p.fk_statut = ".((int) $filteronprojstatus); + $sql .= " AND pt.fk_statut = ".((int) $filteronprojstatus); } if ($usert && $filteronprojstatus > -1) { $sql .= " AND pt.fk_projet = p.rowid AND p.fk_statut = ".((int) $filteronprojstatus);