mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-09 23:11:57 +01:00
"fix for bug #2025: Database error in Timesheet with selected view category/date"
This commit is contained in:
parent
b7444a9598
commit
1fa08b5095
@ -354,7 +354,7 @@ class timesheet_bo extends so_sql_cf
|
|||||||
$sum_extra_cols[$type]{0} = '1';
|
$sum_extra_cols[$type]{0} = '1';
|
||||||
// the $type sum
|
// the $type sum
|
||||||
parent::search($criteria,$sum_ts_id[$type].",'','','',MIN(ts_start),SUM(ts_duration) AS ts_duration,".
|
parent::search($criteria,$sum_ts_id[$type].",'','','',MIN(ts_start),SUM(ts_duration) AS ts_duration,".
|
||||||
($this->quantity_sum ? "SUM(ts_quantity) AS ts_quantity" : '0').",0,NULL,0,0,0,0,SUM($total_sql) AS ts_total",
|
($this->quantity_sum ? "SUM(ts_quantity) AS ts_quantity" : '0').",0,NULL,0,0,0,0,0,SUM($total_sql) AS ts_total",
|
||||||
'GROUP BY '.$sum_sql[$type],$sum_extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
|
'GROUP BY '.$sum_sql[$type],$sum_extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
|
||||||
$sum_extra_cols[$type]{0} = '0';
|
$sum_extra_cols[$type]{0} = '0';
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user