X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=b894b037d8978f59aba61667fb40cee861582a23;hb=3c5c333f6d7a4a3f54fb711547dbd48403912c3a;hp=0a8e727c8fa3a80de0e440a692a4a69c7ed81eed;hpb=7d4e14287bbbd83a07b093e97ac53266494b7628;p=timetracker.git diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 0a8e727c..b894b037 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -58,11 +58,11 @@ class ttReportHelper { // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) + if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users'))) $userlist = join(',', $bean->getAttribute('users')); // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; @@ -103,7 +103,7 @@ class ttReportHelper { // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient())) { + if (($user->can('view_reports') || $user->isClient())) { if ($report['users']) $userlist = $report['users']; else { @@ -115,7 +115,7 @@ class ttReportHelper { } // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; @@ -152,11 +152,11 @@ class ttReportHelper { // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) + if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users'))) $userlist = join(',', $bean->getAttribute('users')); // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; @@ -193,7 +193,7 @@ class ttReportHelper { // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient())) { + if (($user->can('view_reports') || $user->isClient())) { if ($report['users']) $userlist = $report['users']; else { @@ -205,7 +205,7 @@ class ttReportHelper { } // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; @@ -231,6 +231,10 @@ class ttReportHelper { global $user; $mdb2 = getConnection(); + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $group_by_option = $bean->getAttribute('group_by'); $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($bean->getAttribute('chstart') || $bean->getAttribute('chfinish')); @@ -239,7 +243,7 @@ class ttReportHelper { array_push($fields, 'l.id as id'); array_push($fields, '1 as type'); // Type 1 is for tt_log entries. array_push($fields, 'l.date as date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($bean->getAttribute('chclient') || 'client' == $group_by_option) @@ -285,20 +289,27 @@ class ttReportHelper { array_push($fields, "null as expense"); } // Add paid status. - if ($user->canManageTeam() && $bean->getAttribute('chpaid')) + if ($canViewReports && $bean->getAttribute('chpaid')) array_push($fields, 'l.paid as paid'); + // Add IP address. + if ($canViewReports && $bean->getAttribute('chip')) { + array_push($fields, 'l.created as created'); + array_push($fields, 'l.created_ip as created_ip'); + array_push($fields, 'l.modified as modified'); + array_push($fields, 'l.modified_ip as modified_ip'); + } // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; if ($bean->getAttribute('chclient') || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)"; - if ($user->canManageTeam() || $user->isClient() || $user->isPluginEnabled('ex')) + if ($canViewReports || $isClient || $user->isPluginEnabled('ex')) $left_joins .= " left join tt_users u on (u.id = l.user_id)"; if ($bean->getAttribute('chproject') || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = l.project_id)"; @@ -329,7 +340,7 @@ class ttReportHelper { array_push($fields, 'ei.id'); array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries. array_push($fields, 'ei.date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($bean->getAttribute('chclient') || 'client' == $group_by_option) @@ -355,21 +366,29 @@ class ttReportHelper { array_push($fields, 'ei.cost as cost'); array_push($fields, 'ei.cost as expense'); // Add paid status. - if ($user->canManageTeam() && $bean->getAttribute('chpaid')) + if ($canViewReports && $bean->getAttribute('chpaid')) array_push($fields, 'ei.paid as paid'); + // Add IP address. + if ($canViewReports && $bean->getAttribute('chip')) { + array_push($fields, 'ei.created as created'); + array_push($fields, 'ei.created_ip as created_ip'); + array_push($fields, 'ei.modified as modified'); + array_push($fields, 'ei.modified_ip as modified_ip'); + } + // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $left_joins .= " left join tt_users u on (u.id = ei.user_id)"; if ($bean->getAttribute('chclient') || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = ei.client_id)"; if ($bean->getAttribute('chproject') || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = ei.project_id)"; - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)"; $where = ttReportHelper::getExpenseWhere($bean); @@ -387,7 +406,7 @@ class ttReportHelper { $sort_part .= 'date'; else $sort_part .= $group_by_option.', date'; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option) + if (($canViewReports || $isClient) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option) $sort_part .= ', user, type'; if ($bean->getAttribute('chstart')) $sort_part .= ', unformatted_start'; @@ -437,6 +456,39 @@ class ttReportHelper { return $report_items; } + // putInSession stores tt_log and tt_expense_items ids from a report in user session + // as 2 comma-separated lists. + static function putInSession($report_items) { + unset($_SESSION['report_item_ids']); + unset($_SESSION['report_item_expense_ids']); + + // Iterate through records and build 2 comma-separated lists. + foreach($report_items as $item) { + if ($item['type'] == 1) + $report_item_ids .= ','.$item['id']; + else if ($item['type'] == 2) + $report_item_expense_ids .= ','.$item['id']; + } + $report_item_ids = trim($report_item_ids, ','); + $report_item_expense_ids = trim($report_item_expense_ids, ','); + + // The lists are reqdy. Put them in session. + if ($report_item_ids) $_SESSION['report_item_ids'] = $report_item_ids; + if ($report_item_expense_ids) $_SESSION['report_item_expense_ids'] = $report_item_expense_ids; + } + + // getFromSession obtains tt_log and tt_expense_items ids stored in user session. + static function getFromSession() { + $items = array(); + $report_item_ids = $_SESSION['report_item_ids']; + if ($report_item_ids) + $items['report_item_ids'] = explode(',', $report_item_ids); + $report_item_expense_ids = $_SESSION['report_item_expense_ids']; + if ($report_item_expense_ids) + $items['report_item_expense_ids'] = explode(',', $report_item_expense_ids); + return $items; + } + // getFavItems retrieves all items associated with a favorite report. // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all. // Expense items use the "note" field for item name. @@ -444,6 +496,10 @@ class ttReportHelper { global $user; $mdb2 = getConnection(); + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $group_by_option = $report['group_by']; $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($report['show_start'] || $report['show_end']); @@ -452,7 +508,7 @@ class ttReportHelper { array_push($fields, 'l.id as id'); array_push($fields, '1 as type'); // Type 1 is for tt_log entries. array_push($fields, 'l.date as date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($report['show_client'] || 'client' == $group_by_option) @@ -497,17 +553,27 @@ class ttReportHelper { array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user. array_push($fields, "null as expense"); } + // Add paid status. + if ($canViewReports && $report['show_paid']) + array_push($fields, 'l.paid as paid'); + // Add IP address. + if ($canViewReports && $report['show_ip']) { + array_push($fields, 'l.created as created'); + array_push($fields, 'l.created_ip as created_ip'); + array_push($fields, 'l.modified as modified'); + array_push($fields, 'l.modified_ip as modified_ip'); + } // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; if ($report['show_client'] || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)"; - if ($user->canManageTeam() || $user->isClient() || $user->isPluginEnabled('ex')) + if ($canViewReports || $isClient || $user->isPluginEnabled('ex')) $left_joins .= " left join tt_users u on (u.id = l.user_id)"; if ($report['show_project'] || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = l.project_id)"; @@ -538,7 +604,7 @@ class ttReportHelper { array_push($fields, 'ei.id'); array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries. array_push($fields, 'ei.date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($report['show_client'] || 'client' == $group_by_option) @@ -563,19 +629,29 @@ class ttReportHelper { array_push($fields, 'ei.name as note'); array_push($fields, 'ei.cost as cost'); array_push($fields, 'ei.cost as expense'); + // Add paid status. + if ($canViewReports && $report['show_paid']) + array_push($fields, 'ei.paid as paid'); + // Add IP address. + if ($canViewReports && $report['show_ip']) { + array_push($fields, 'ei.created as created'); + array_push($fields, 'ei.created_ip as created_ip'); + array_push($fields, 'ei.modified as modified'); + array_push($fields, 'ei.modified_ip as modified_ip'); + } // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $left_joins .= " left join tt_users u on (u.id = ei.user_id)"; if ($report['show_client'] || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = ei.client_id)"; if ($report['show_project'] || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = ei.project_id)"; - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)"; $where = ttReportHelper::getFavExpenseWhere($report); @@ -593,7 +669,7 @@ class ttReportHelper { $sort_part .= 'date'; else $sort_part .= $group_by_option.', date'; - if (($user->canManageTeam() || $user->isClient()) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option) + if (($canViewReports || $isClient) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option) $sort_part .= ', user, type'; if ($report['show_start']) $sort_part .= ', unformatted_start'; @@ -1057,12 +1133,33 @@ class ttReportHelper { } } + // The markPaid marks a set of records as either paid or unpaid. + static function markPaid($time_log_ids, $expense_item_ids, $paid = true) + { + $mdb2 = getConnection(); + $paid_val = (int) $paid; + if ($time_log_ids) { + $sql = "update tt_log set paid = $paid_val where id in(".join(', ', $time_log_ids).")"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } + if ($expense_item_ids) { + $sql = "update tt_expense_items set paid = $paid_val where id in(".join(', ', $expense_item_ids).")"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } + } + // prepareReportBody - prepares an email body for report. static function prepareReportBody($bean, $comment) { global $user; global $i18n; + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $items = ttReportHelper::getItems($bean); $group_by = $bean->getAttribute('group_by'); if ($group_by && 'no_grouping' != $group_by) @@ -1091,7 +1188,7 @@ class ttReportHelper { $body .= '
'; // Output title. - $body .= ''.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'
'; + $body .= ''.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'
'; // Output comment. if ($comment) $body .= ''.htmlspecialchars($comment).'
'; @@ -1104,16 +1201,16 @@ class ttReportHelper { $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']); else { $key = 'label.'.$group_by; - $group_by_header = $i18n->getKey($key); + $group_by_header = $i18n->get($key); } $body .= ''.$group_by_header.' | '; if ($bean->getAttribute('chduration')) - $body .= ''.$i18n->getKey('label.duration').' | '; + $body .= ''.$i18n->get('label.duration').' | '; if ($bean->getAttribute('chcost')) - $body .= ''.$i18n->getKey('label.cost').' | '; + $body .= ''.$i18n->get('label.cost').' | '; $body .= '|||||||||||||||||||||
'; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses']; $body .= ' | '; } $body .= '|||||||||||||||||||||||||
'.$i18n->getKey('label.total').' | '; + $body .= ''.$i18n->get('label.total').' | '; if ($bean->getAttribute('chduration')) { $body .= ''; if ($totals['time'] <> '0:00') $body .= $totals['time']; @@ -1142,7 +1239,7 @@ class ttReportHelper { } if ($bean->getAttribute('chcost')) { $body .= ' | '.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= ' | '; } $body .= '
'.$i18n->getKey('label.date').' | '; - if ($user->canManageTeam() || $user->isClient()) - $body .= ''.$i18n->getKey('label.user').' | '; + $body .= ''.$i18n->get('label.date').' | '; + if ($canViewReports || $isClient) + $body .= ''.$i18n->get('label.user').' | '; if ($bean->getAttribute('chclient')) - $body .= ''.$i18n->getKey('label.client').' | '; + $body .= ''.$i18n->get('label.client').' | '; if ($bean->getAttribute('chproject')) - $body .= ''.$i18n->getKey('label.project').' | '; + $body .= ''.$i18n->get('label.project').' | '; if ($bean->getAttribute('chtask')) - $body .= ''.$i18n->getKey('label.task').' | '; + $body .= ''.$i18n->get('label.task').' | '; if ($bean->getAttribute('chcf_1')) $body .= ''.htmlspecialchars($custom_fields->fields[0]['label']).' | '; if ($bean->getAttribute('chstart')) - $body .= ''.$i18n->getKey('label.start').' | '; + $body .= ''.$i18n->get('label.start').' | '; if ($bean->getAttribute('chfinish')) - $body .= ''.$i18n->getKey('label.finish').' | '; + $body .= ''.$i18n->get('label.finish').' | '; if ($bean->getAttribute('chduration')) - $body .= ''.$i18n->getKey('label.duration').' | '; + $body .= ''.$i18n->get('label.duration').' | '; if ($bean->getAttribute('chnote')) - $body .= ''.$i18n->getKey('label.note').' | '; + $body .= ''.$i18n->get('label.note').' | '; if ($bean->getAttribute('chcost')) - $body .= ''.$i18n->getKey('label.cost').' | '; + $body .= ''.$i18n->get('label.cost').' | '; if ($bean->getAttribute('chpaid')) - $body .= ''.$i18n->getKey('label.paid').' | '; + $body .= ''.$i18n->get('label.paid').' | '; + if ($bean->getAttribute('chip')) + $body .= ''.$i18n->get('label.ip').' | '; if ($bean->getAttribute('chinvoice')) - $body .= ''.$i18n->getKey('label.invoice').' | '; + $body .= ''.$i18n->get('label.invoice').' | '; $body .= '
'.$i18n->getKey('label.subtotal').' | '; + $body .= ''.$i18n->get('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chclient')) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chproject')) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chtask')) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1215,10 +1314,11 @@ class ttReportHelper { if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) { $body .= ' | '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; $body .= ' | '; } if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' | ||||||||||||||
'.$record['date'].' | '; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''.htmlspecialchars($record['user']).' | '; if ($bean->getAttribute('chclient')) $body .= ''.htmlspecialchars($record['client']).' | '; @@ -1253,7 +1353,12 @@ class ttReportHelper { $body .= ''.$record['cost'].' | '; if ($bean->getAttribute('chpaid')) { $body .= ''; - $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no'); + $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no'); + $body .= ' | '; + } + if ($bean->getAttribute('chip')) { + $body .= ''; + $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created']; $body .= ' | '; } if ($bean->getAttribute('chinvoice')) @@ -1269,9 +1374,9 @@ class ttReportHelper { // Print a terminating subtotal. if ($print_subtotals) { $body .= '||||||||||||||||||||
'.$i18n->getKey('label.subtotal').' | '; + $body .= ''.$i18n->get('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chclient')) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chproject')) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chtask')) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1282,10 +1387,11 @@ class ttReportHelper { if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) { $body .= ' | '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; $body .= ' | '; } if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' | ||||||||||||||
'.$i18n->getKey('label.total').' | '; - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + $body .= ' | '.$i18n->get('label.total').' | '; + if ($canViewReports || $isClient) $body .= ''; if ($bean->getAttribute('chclient')) $body .= ' | '; if ($bean->getAttribute('chproject')) $body .= ' | '; if ($bean->getAttribute('chtask')) $body .= ' | '; @@ -1305,10 +1411,11 @@ class ttReportHelper { if ($bean->getAttribute('chnote')) $body .= ' | '; if ($bean->getAttribute('chcost')) { $body .= ' | '.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= ' | '; } if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' |