X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=report.php;h=efbaccea8ea74136a23b14d4bbeeaf8612c71c81;hb=b027028b5322fcbfb6de53e7a74529cbac7931de;hp=c59f6b5e3ec78d0ded043163cb00d89ff0a11b74;hpb=030d2c3ffbf8229cc945427e9e9f7704226effe1;p=timetracker.git diff --git a/report.php b/report.php index c59f6b5e..efbaccea 100644 --- a/report.php +++ b/report.php @@ -33,7 +33,7 @@ import('ttReportHelper'); import('ttTeamHelper'); // Access check. -if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) { +if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) { header('Location: access_denied.php'); exit(); } @@ -54,7 +54,7 @@ if ($user->isPluginEnabled('iv')) { // Use custom fields plugin if it is enabled. if ($user->isPluginEnabled('cf')) { require_once('plugins/CustomFields.class.php'); - $custom_fields = new CustomFields($user->team_id); + $custom_fields = new CustomFields($user->group_id); $smarty->assign('custom_fields', $custom_fields); } @@ -69,12 +69,13 @@ $client_id = $bean->getAttribute('client'); // Do we need to show checkboxes? if ($bean->getAttribute('chpaid') || - ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by')) && !$user->isClient())) { - $smarty->assign('use_checkboxes', true); + ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) { + if ($user->can('manage_invoices')) + $smarty->assign('use_checkboxes', true); } // Controls for "Mark paid" block. -if ($bean->getAttribute('chpaid')) { +if ($user->can('manage_invoices') && $bean->getAttribute('chpaid')) { $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select')); $form->addInput(array('type'=>'combobox', 'name'=>'mark_paid_select_options', @@ -90,9 +91,10 @@ if ($bean->getAttribute('chpaid')) { } // Controls for "Assign to invoice" block. -if ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by')) && !$user->isClient()) { +if ($user->can('manage_invoices') && + ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) { // Client is selected and we are displaying the invoice column. - $recent_invoices = ttTeamHelper::getRecentInvoices($user->team_id, $client_id); + $recent_invoices = ttTeamHelper::getRecentInvoices($user->group_id, $client_id); if ($recent_invoices) { $assign_invoice_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select')); $form->addInput(array('type'=>'combobox', @@ -168,22 +170,23 @@ if ($request->isPost()) { } } // isPost -$group_by = $bean->getAttribute('group_by'); +$group_by = $bean->getAttribute('group_by1'); -$report_items = ttReportHelper::getItems($bean); +$options = ttReportHelper::getReportOptions($bean); +$report_items = ttReportHelper::getItems($options); // Store record ids in session in case user wants to act on records such as marking them all paid. if ($request->isGet() && $user->isPluginEnabled('ps')) ttReportHelper::putInSession($report_items); if ('no_grouping' != $group_by) - $subtotals = ttReportHelper::getSubtotals($bean); -$totals = ttReportHelper::getTotals($bean); + $subtotals = ttReportHelper::getSubtotals($options); +$totals = ttReportHelper::getTotals($options); // Assign variables that are used to print subtotals. -if ($report_items && 'no_grouping' != $group_by) { +if ($report_items && 'no_grouping' != $group_by1) { $smarty->assign('print_subtotals', true); $smarty->assign('first_pass', true); - $smarty->assign('group_by', $group_by); + $smarty->assign('group_by1', $group_by1); $smarty->assign('prev_grouped_by', ''); $smarty->assign('cur_grouped_by', ''); }