projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented configurable holidays.
[timetracker.git]
/
report.php
diff --git
a/report.php
b/report.php
index
b82380d
..
53c73ee
100644
(file)
--- 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.
// - 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_
r
eports')))
$useMarkApproved = true;
if ($bean->getAttribute('chpaid') && $user->can('manage_invoices'))
$useMarkPaid = true;
$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 (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);
}
$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++;
// Determine column span for note field.
$colspan = 1;
if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;