Fixed update link for version 1.17.44 to 1.17.97.

[timetracker.git] / report.php

diff --git a/report.php b/report.php
index 5f7e687bf18013b55ef1e83665654472a7a7d98b..924c7801a984636ad677903b3cdb1d174799992c 100644 (file)
--- a/report.php
+++ b/report.php
@@ -30,7 +30,7 @@ require_once('initialize.php');
 import('form.Form');
 import('form.ActionForm');
 import('ttReportHelper');
 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'))) {
 
 // Access check.
 if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {


@@ -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');
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');

-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields();

   $smarty->assign('custom_fields', $custom_fields);
 }
 
   $smarty->assign('custom_fields', $custom_fields);
 }
 


@@ -94,7 +94,7 @@ if ($user->can('manage_invoices') && $bean->getAttribute('chpaid')) {
 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.
 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',
   if ($recent_invoices) {
     $assign_invoice_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
     $form->addInput(array('type'=>'combobox',


@@ -173,12 +173,14 @@ if ($request->isPost()) {
 $group_by = $bean->getAttribute('group_by1');
 
 $options = ttReportHelper::getReportOptions($bean);
 $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);
 
 $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)
+if (ttReportHelper::grouping($options))

   $subtotals = ttReportHelper::getSubtotals($options);
 $totals = ttReportHelper::getTotals($options);
 
   $subtotals = ttReportHelper::getSubtotals($options);
 $totals = ttReportHelper::getTotals($options);
 


@@ -201,6 +203,9 @@ if ('no_grouping' != $group_by) {
   } */
   $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
 }
   } */
   $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', '');
 // Assign variables that are used to alternate color of rows for different dates.
 $smarty->assign('prev_date', '');
 $smarty->assign('cur_date', '');