mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
fixed not shown day-sum (caused by 0 == 'ts_id')
This commit is contained in:
parent
367811306f
commit
c13dccd96e
@ -560,7 +560,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,array(
|
parent::search($criteria,array(
|
||||||
$sum_ts_id[$type],"''","''","''",'MIN(ts_start)','SUM(ts_duration) AS ts_duration',
|
(string)$sum_ts_id[$type],"''","''","''",'MIN(ts_start)','SUM(ts_duration) AS ts_duration',
|
||||||
($this->quantity_sum ? "SUM(ts_quantity) AS ts_quantity" : '0'),
|
($this->quantity_sum ? "SUM(ts_quantity) AS ts_quantity" : '0'),
|
||||||
'0','NULL','0','0','0','0','0',"SUM($total_sql) AS ts_total"
|
'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);
|
||||||
|
Loading…
Reference in New Issue
Block a user