X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/957007719ca06e990ad29d9be24126decca8cac9..076f64bf058fdda95d95428c95d3acfbbdf93448:/report.php diff --git a/report.php b/report.php index b82380d7..53c73ee1 100644 --- a/report.php +++ b/report.php @@ -91,7 +91,7 @@ $options = ttReportHelper::getReportOptions($bean); // - We can sssign items to invoices. // - We can assign items to a timesheet. // Determine these conditions separately. -if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_eports'))) +if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_reports'))) $useMarkApproved = true; if ($bean->getAttribute('chpaid') && $user->can('manage_invoices')) $useMarkPaid = true; @@ -275,17 +275,16 @@ if ($request->isGet() && $use_checkboxes) if (ttReportHelper::grouping($options)) { $subtotals = ttReportHelper::getSubtotals($options); $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options)); + if ($report_items) { + // Assign variables that are used to print subtotals. + $smarty->assign('print_subtotals', true); + $smarty->assign('first_pass', true); + $smarty->assign('prev_grouped_by', ''); + $smarty->assign('cur_grouped_by', ''); + } } $totals = ttReportHelper::getTotals($options); -// Assign variables that are used to print subtotals. -if ($report_items) { - $smarty->assign('print_subtotals', true); - $smarty->assign('first_pass', true); - $smarty->assign('prev_grouped_by', ''); - $smarty->assign('cur_grouped_by', ''); -} - // Determine column span for note field. $colspan = 1; if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;