extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add total field to merge

Browse Source
This commit is contained in:
Nathan Gray 2011-05-12 19:30:01 +00:00
parent 450b380de1
commit 41808c52c3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
timesheet/inc/class.timesheet_merge.inc.php
View File

@ -113,7 +113,8 @@ class timesheet_merge extends bo_merge
importexport_export_csv::convert($record, $types, 'timesheet', $selects); importexport_export_csv::convert($record, $types, 'timesheet', $selects);
$array = $record->get_record_array(); $array = $record->get_record_array();
foreach(array('ts_duration','ts_quantity','ts_unitprice') as $key) $array['ts_total'] = $array['ts_quantity'] * $array['ts_unitprice'];
foreach(array('ts_duration','ts_quantity','ts_unitprice','ts_total') as $key)
{ {
$array[$key] = self::number_format($array[$key],2,$this->mimetype); $array[$key] = self::number_format($array[$key],2,$this->mimetype);
} }
@ -146,7 +147,7 @@ class timesheet_merge extends bo_merge
echo '<tr><td colspan="4"><h3>'.lang('Timesheet fields:')."</h3></td></tr>"; echo '<tr><td colspan="4"><h3>'.lang('Timesheet fields:')."</h3></td></tr>";
$n = 0; $n = 0;
$fields = array('ts_id' => lang('Timesheet ID')) + $this->bo->field2label; $fields = array('ts_id' => lang('Timesheet ID')) + $this->bo->field2label + array('ts_total' => lang('total'));
foreach($fields as $name => $label) foreach($fields as $name => $label)
{ {
if (in_array($name,array('pl_id','customfields'))) continue; // dont show them if (in_array($name,array('pl_id','customfields'))) continue; // dont show them