extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Timesheet: Fix broken total in header

Browse Source 
Passing columns as string caused them to get split by comma, but $total_sql had round(...,2) in it.  Changed to use array.
This commit is contained in:
nathan 2023-04-11 17:32:55 -06:00
parent 9f20a89306
commit a6a30e80b5
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
timesheet/inc/class.timesheet_bo.inc.php
View File

@ -510,12 +510,20 @@ class timesheet_bo extends Api\Storage
// if we only want to return the summary (sum of duration and sum of price) we have to take care that the customfield table // if we only want to return the summary (sum of duration and sum of price) we have to take care that the customfield table
// is not joined, as the join causes a multiplication of the sum per customfield found // is not joined, as the join causes a multiplication of the sum per customfield found
// joining of the cutomfield table is triggered by criteria being set with either a string or an array // joining of the cutomfield table is triggered by criteria being set with either a string or an array
$this->summary = parent::search($only_summary ? null : $criteria, $cols = ['SUM(ts_duration) AS duration',
"SUM(ts_duration) AS duration,SUM($total_sql) AS price,MAX(ts_modified) AS max_modified". "SUM($total_sql) AS price",
($this->quantity_sum ? ",SUM(ts_quantity) AS quantity" : ''), 'MAX(ts_modified) AS max_modified'];
if($this->quantity_sum)
{
$cols[] = 'SUM(ts_quantity) AS quantity';
}
$this->summary = parent::search(
$only_summary ? null : $criteria,
$cols,
'', '', $wildcard, $empty, $op, false, '', '', $wildcard, $empty, $op, false,
$only_summary && is_array($criteria) ? ($filter ? array_merge($criteria, (array)$filter) : $criteria) : $filter, $only_summary && is_array($criteria) ? ($filter ? array_merge($criteria, (array)$filter) : $criteria) : $filter,
$only_summary ? '' : $join); $only_summary ? '' : $join
);
$this->summary = $this->summary[0]; $this->summary = $this->summary[0];
$this->summary['max_modified'] = Api\DateTime::server2user($this->summary['max_modified']); $this->summary['max_modified'] = Api\DateTime::server2user($this->summary['max_modified']);