import('form.Form');
import('form.ActionForm');
import('ttReportHelper');
-import('ttTeamHelper');
+import('ttGroupHelper');
// Access check.
if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {
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->group_id, $client_id);
+ $recent_invoices = ttGroupHelper::getRecentInvoices($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',
}
} // isPost
-$group_by = $bean->getAttribute('group_by1');
-
$options = ttReportHelper::getReportOptions($bean);
-$group_by_tag = ttReportHelper::makeGroupByXmlTag($options);
$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 (ttReportHelper::grouping($options))
+if (ttReportHelper::grouping($options)) {
$subtotals = ttReportHelper::getSubtotals($options);
+ $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
+}
$totals = ttReportHelper::getTotals($options);
// Assign variables that are used to print subtotals.
-if ($report_items && 'no_grouping' != $group_by1) {
+if ($report_items) {
$smarty->assign('print_subtotals', true);
$smarty->assign('first_pass', true);
- $smarty->assign('group_by1', $group_by1);
$smarty->assign('prev_grouped_by', '');
$smarty->assign('cur_grouped_by', '');
}
-// Determine group by header.
-if ('no_grouping' != $group_by) {
- /*
- if ('cf_1' == $group_by)
- $smarty->assign('group_by_header', $custom_fields->fields[0]['label']);
- else {
- $key = 'label.'.$group_by;
- $smarty->assign('group_by_header', $i18n->get($key));
- } */
- $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
-}
-
-$smarty->assign('group_by', $group_by_tag);
// Assign variables that are used to alternate color of rows for different dates.
$smarty->assign('prev_date', '');
$smarty->assign('cur_date', '');
$smarty->assign('report_row_class', 'rowReportItem');
-
$smarty->assign('forms', array($form->getName()=>$form->toArray()));
-
$smarty->assign('report_items', $report_items);
$smarty->assign('subtotals', $subtotals);
$smarty->assign('totals', $totals);