Skip to content

Commit

Permalink
Update task.class.php
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy authored Feb 16, 2024
1 parent 5a354e2 commit cbf51f9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions htdocs/projet/class/task.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,7 @@ public function getTasksArray($usert = null, $userp = null, $projectid = 0, $soc
if ($includebilltime) {
$sql .= " GROUP BY p.rowid, p.ref, p.title, p.public, p.fk_statut, p.usage_bill_time,";
$sql .= " t.datec, t.dateo, t.datee, t.tms,";
$sql .= " t.rowid, t.ref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.status,";
$sql .= " t.rowid, t.ref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_status,";
$sql .= " t.dateo, t.datee, t.planned_workload, t.rang,";
$sql .= " t.description, ";
$sql .= " t.budget_amount, ";
Expand Down Expand Up @@ -1236,7 +1236,7 @@ public function getUserRolesForProjectsOrTasks($userp, $usert, $projectid = '',
$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
$sql .= " WHERE pt.rowid = ec.element_id";
if ($userp && $filteronprojstatus > -1) {
$sql .= " AND pt.status = ".((int) $filteronprojstatus);
$sql .= " AND pt.fk_status = ".((int) $filteronprojstatus);
}
if ($usert && $filteronprojstatus > -1) {
$sql .= " AND pt.fk_projet = p.rowid AND p.fk_statut = ".((int) $filteronprojstatus);
Expand Down

0 comments on commit cbf51f9

Please sign in to comment.