Merged getTotals and getFavTotals into one function.

[timetracker.git] / WEB-INF / lib / ttReportHelper.class.php

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index a51cbec285409e2e74d4aae5eb5a7db33ce53a92..28a0bc54839e649c15aefcb8350cfa4e41080dfa 100644 (file)
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -37,238 +37,149 @@ require_once(dirname(__FILE__).'/../../plugins/CustomFields.class.php');
 class ttReportHelper {
 
   // getWhere prepares a WHERE clause for a report query.
 class ttReportHelper {
 
   // getWhere prepares a WHERE clause for a report query.

-  static function getWhere($bean) {
+  static function getWhere($options) {

     global $user;
 
     global $user;
 

-       // Prepare dropdown parts.
+    // Prepare dropdown parts.

     $dropdown_parts = '';
     $dropdown_parts = '';

-    if ($bean->getAttribute('client'))
-      $dropdown_parts .= ' and l.client_id = '.$bean->getAttribute('client');
-    else if ($user->isClient() && $user->client_id)
+    if ($options['client_id'])
+      $dropdown_parts .= ' and l.client_id = '.$options['client_id'];
+    elseif ($user->isClient() && $user->client_id)

       $dropdown_parts .= ' and l.client_id = '.$user->client_id;
       $dropdown_parts .= ' and l.client_id = '.$user->client_id;

-    if ($bean->getAttribute('option')) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$bean->getAttribute('option').')';
-    if ($bean->getAttribute('project')) $dropdown_parts .= ' and l.project_id = '.$bean->getAttribute('project');
-    if ($bean->getAttribute('task')) $dropdown_parts .= ' and l.task_id = '.$bean->getAttribute('task');
-    if ($bean->getAttribute('include_records')=='1') $dropdown_parts .= ' and l.billable = 1';
-    if ($bean->getAttribute('include_records')=='2') $dropdown_parts .= ' and l.billable = 0';
-    if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
-    if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
-        
-    // Prepare user list part.
-    $userlist = -1;
-    if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users')))
-      $userlist = join(',', $bean->getAttribute('users'));
-    // Prepare sql query part for user list.
-    $user_list_part = null;
-    if ($user->canManageTeam() || $user->isClient())
-      $user_list_part = " and l.user_id in ($userlist)";
-    else
-      $user_list_part = " and l.user_id = ".$user->id;
-    
-    // Prepare sql query part for where.
-    if ($bean->getAttribute('period'))
-      $period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format));
-    else {
-      $period = new Period();
-      $period->setPeriod(
-        new DateAndTime($user->date_format, $bean->getAttribute('start_date')),
-        new DateAndTime($user->date_format, $bean->getAttribute('end_date')));
-    }
-    $where = " where l.status = 1 and l.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
-      " $user_list_part $dropdown_parts";
-    return $where;
-  }
-  
-  // getFavWhere prepares a WHERE clause for a favorite report query.
-  static function getFavWhere($report) {
-    global $user;
+    if ($options['cf_1_option_id']) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$options['cf_1_option_id'].')';
+    if ($options['project_id']) $dropdown_parts .= ' and l.project_id = '.$options['project_id'];
+    if ($options['task_id']) $dropdown_parts .= ' and l.task_id = '.$options['task_id'];
+    if ($options['billable']=='1') $dropdown_parts .= ' and l.billable = 1';
+    if ($options['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
+    if ($options['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
+    if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
+    if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
+    if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';

 
 

-       // Prepare dropdown parts.
-    $dropdown_parts = '';
-    if ($report['client_id'])
-      $dropdown_parts .= ' and l.client_id = '.$report['client_id'];
-    else if ($user->isClient() && $user->client_id)
-      $dropdown_parts .= ' and l.client_id = '.$user->client_id;
-    if ($report['cf_1_option_id']) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$report['cf_1_option_id'].')';
-    if ($report['project_id']) $dropdown_parts .= ' and l.project_id = '.$report['project_id'];
-    if ($report['task_id']) $dropdown_parts .= ' and l.task_id = '.$report['task_id'];
-    if ($report['billable']=='1') $dropdown_parts .= ' and l.billable = 1';
-    if ($report['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
-    if ($report['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
-    if ($report['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
-        
-    // Prepare user list part.
-    $userlist = -1;
-    if (($user->canManageTeam() || $user->isClient())) {
-      if ($report['users'])
-        $userlist = $report['users'];
-      else {
-       $active_users = ttTeamHelper::getActiveUsers();
-        foreach ($active_users as $single_user)
-          $users[] = $single_user['id'];
-        $userlist = join(',', $users);
-      }
-    }

     // Prepare sql query part for user list.
     // Prepare sql query part for user list.

-    $user_list_part = null;
-    if ($user->canManageTeam() || $user->isClient())
+    $userlist = $options['users'] ? $options['users'] : '-1';
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())

       $user_list_part = " and l.user_id in ($userlist)";
     else
       $user_list_part = " and l.user_id = ".$user->id;
       $user_list_part = " and l.user_id in ($userlist)";
     else
       $user_list_part = " and l.user_id = ".$user->id;

-    
-    // Prepare sql query part for where.
-    if ($report['period'])
-      $period = new Period($report['period'], new DateAndTime($user->date_format));
-    else {
-      $period = new Period();
-      $period->setPeriod(
-        new DateAndTime($user->date_format, $report['period_start']),
-        new DateAndTime($user->date_format, $report['period_end']));
-    }
-    $where = " where l.status = 1 and l.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
-      " $user_list_part $dropdown_parts";
-    return $where;
-  }
-  
-  // getExpenseWhere prepares WHERE clause for expenses query in a report.
-  static function getExpenseWhere($bean) {
-    global $user;
+    $user_list_part .= " and l.group_id = ".$user->getActiveGroup();

 
 

-       // Prepare dropdown parts.
-    $dropdown_parts = '';
-    if ($bean->getAttribute('client'))
-      $dropdown_parts .= ' and ei.client_id = '.$bean->getAttribute('client');
-    else if ($user->isClient() && $user->client_id)
-      $dropdown_parts .= ' and ei.client_id = '.$user->client_id;
-    if ($bean->getAttribute('project')) $dropdown_parts .= ' and ei.project_id = '.$bean->getAttribute('project');
-    if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
-    if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
-        
-    // Prepare user list part.
-    $userlist = -1;
-    if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users')))
-      $userlist = join(',', $bean->getAttribute('users'));
-    // Prepare sql query part for user list.
-    $user_list_part = null;
-    if ($user->canManageTeam() || $user->isClient())
-      $user_list_part = " and ei.user_id in ($userlist)";
-    else
-      $user_list_part = " and ei.user_id = ".$user->id;
-    

     // Prepare sql query part for where.
     // Prepare sql query part for where.

-    if ($bean->getAttribute('period'))
-      $period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format));
+    if ($options['period'])
+      $period = new Period($options['period'], new DateAndTime($user->date_format));

     else {
       $period = new Period();
       $period->setPeriod(
     else {
       $period = new Period();
       $period->setPeriod(

-        new DateAndTime($user->date_format, $bean->getAttribute('start_date')),
-        new DateAndTime($user->date_format, $bean->getAttribute('end_date')));
+        new DateAndTime($user->date_format, $options['period_start']),
+        new DateAndTime($user->date_format, $options['period_end']));

     }
     }

-    $where = " where ei.status = 1 and ei.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
+    $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".

       " $user_list_part $dropdown_parts";
     return $where;
   }
 
       " $user_list_part $dropdown_parts";
     return $where;
   }
 

-  // getFavExpenseWhere prepares a WHERE clause for expenses query in a favorite report.
-  static function getFavExpenseWhere($report) {
+  // getExpenseWhere prepares WHERE clause for expenses query in a report.
+  static function getExpenseWhere($options) {

     global $user;
 
     global $user;
 

-       // Prepare dropdown parts.
+    // Prepare dropdown parts.

     $dropdown_parts = '';
     $dropdown_parts = '';

-    if ($report['client_id'])
-      $dropdown_parts .= ' and ei.client_id = '.$report['client_id'];
-    else if ($user->isClient() && $user->client_id)
+    if ($options['client_id'])
+      $dropdown_parts .= ' and ei.client_id = '.$options['client_id'];
+    elseif ($user->isClient() && $user->client_id)

       $dropdown_parts .= ' and ei.client_id = '.$user->client_id;
       $dropdown_parts .= ' and ei.client_id = '.$user->client_id;

-    if ($report['project_id']) $dropdown_parts .= ' and ei.project_id = '.$report['project_id'];
-    if ($report['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
-    if ($report['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
-        
-    // Prepare user list part.
-    $userlist = -1;
-    if (($user->canManageTeam() || $user->isClient())) {
-      if ($report['users'])
-        $userlist = $report['users'];
-      else {
-       $active_users = ttTeamHelper::getActiveUsers();
-        foreach ($active_users as $single_user)
-          $users[] = $single_user['id'];
-        $userlist = join(',', $users);
-      }
-    }
+    if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id'];
+    if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
+    if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
+    if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
+    if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
+

     // Prepare sql query part for user list.
     // Prepare sql query part for user list.

-    $user_list_part = null;
-    if ($user->canManageTeam() || $user->isClient())
+    $userlist = $options['users'] ? $options['users'] : '-1';
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())

       $user_list_part = " and ei.user_id in ($userlist)";
     else
       $user_list_part = " and ei.user_id = ".$user->id;
       $user_list_part = " and ei.user_id in ($userlist)";
     else
       $user_list_part = " and ei.user_id = ".$user->id;

-    
+    $user_list_part .= " and ei.group_id = ".$user->getActiveGroup();
+

     // Prepare sql query part for where.
     // Prepare sql query part for where.

-    if ($report['period'])
-      $period = new Period($report['period'], new DateAndTime($user->date_format));
+    if ($options['period'])
+      $period = new Period($options['period'], new DateAndTime($user->date_format));

     else {
       $period = new Period();
       $period->setPeriod(
     else {
       $period = new Period();
       $period->setPeriod(

-        new DateAndTime($user->date_format, $report['period_start']),
-        new DateAndTime($user->date_format, $report['period_end']));
+        new DateAndTime($user->date_format, $options['period_start']),
+        new DateAndTime($user->date_format, $options['period_end']));

     }
     }

-    $where = " where ei.status = 1 and ei.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
+    $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".

       " $user_list_part $dropdown_parts";
     return $where;
   }
       " $user_list_part $dropdown_parts";
     return $where;
   }

-    
+

   // getItems retrieves all items associated with a report.
   // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all.
   // Expense items use the "note" field for item name.
   // getItems retrieves all items associated with a report.
   // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all.
   // Expense items use the "note" field for item name.

-  static function getItems($bean) {
+  static function getItems($options) {

     global $user;
     $mdb2 = getConnection();
     global $user;
     $mdb2 = getConnection();

-    
-    $group_by_option = $bean->getAttribute('group_by');
-    $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($bean->getAttribute('chstart') || $bean->getAttribute('chfinish'));
-    
+
+    // Determine these once as they are used in multiple places in this function.
+    $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
+    $isClient = $user->isClient();
+
+    $group_by_option = $options['group_by'];
+    $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']);
+

     // Prepare a query for time items in tt_log table.
     $fields = array(); // An array of fields for database query.
     array_push($fields, 'l.id as id');
     array_push($fields, '1 as type'); // Type 1 is for tt_log entries.
     array_push($fields, 'l.date as date');
     // Prepare a query for time items in tt_log table.
     $fields = array(); // An array of fields for database query.
     array_push($fields, 'l.id as id');
     array_push($fields, '1 as type'); // Type 1 is for tt_log entries.
     array_push($fields, 'l.date as date');

-    if($user->canManageTeam() || $user->isClient())
+    if($canViewReports || $isClient)

       array_push($fields, 'u.name as user');
     // Add client name if it is selected.
       array_push($fields, 'u.name as user');
     // Add client name if it is selected.

-    if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
+    if ($options['show_client'] || 'client' == $group_by_option)

       array_push($fields, 'c.name as client');
     // Add project name if it is selected.
       array_push($fields, 'c.name as client');
     // Add project name if it is selected.

-    if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
+    if ($options['show_project'] || 'project' == $group_by_option)

       array_push($fields, 'p.name as project');
     // Add task name if it is selected.
       array_push($fields, 'p.name as project');
     // Add task name if it is selected.

-    if ($bean->getAttribute('chtask') || 'task' == $group_by_option)
+    if ($options['show_task'] || 'task' == $group_by_option)

       array_push($fields, 't.name as task');
     // Add custom field.
       array_push($fields, 't.name as task');
     // Add custom field.

-    $include_cf_1 = $bean->getAttribute('chcf_1') || 'cf_1' == $group_by_option;
+    $include_cf_1 = $options['show_custom_field_1'] || 'cf_1' == $group_by_option;

     if ($include_cf_1) {
     if ($include_cf_1) {

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

       $cf_1_type = $custom_fields->fields[0]['type'];
       if ($cf_1_type == CustomFields::TYPE_TEXT) {
       $cf_1_type = $custom_fields->fields[0]['type'];
       if ($cf_1_type == CustomFields::TYPE_TEXT) {

-        array_push($fields, 'cfl.value as cf_1');      
-      } else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-           array_push($fields, 'cfo.value as cf_1');   
+        array_push($fields, 'cfl.value as cf_1');
+      } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+        array_push($fields, 'cfo.value as cf_1');

       }
     }
     // Add start time.
       }
     }
     // Add start time.

-    if ($bean->getAttribute('chstart')) {
+    if ($options['show_start']) {

       array_push($fields, "l.start as unformatted_start");
       array_push($fields, "TIME_FORMAT(l.start, '%k:%i') as start");
     }
     // Add finish time.
       array_push($fields, "l.start as unformatted_start");
       array_push($fields, "TIME_FORMAT(l.start, '%k:%i') as start");
     }
     // Add finish time.

-    if ($bean->getAttribute('chfinish'))
+    if ($options['show_end'])

       array_push($fields, "TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), '%k:%i') as finish");
     // Add duration.
       array_push($fields, "TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), '%k:%i') as finish");
     // Add duration.

-    if ($bean->getAttribute('chduration'))
+    if ($options['show_duration'])

       array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
       array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");

+    // Add work units.
+    if ($options['show_work_units']) {
+      if ($user->unit_totals_only)
+        array_push($fields, "null as units");
+      else
+        array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units");
+    }

     // Add note.
     // Add note.

-    if ($bean->getAttribute('chnote'))
+    if ($options['show_note'])

       array_push($fields, 'l.comment as note');
     // Handle cost.
       array_push($fields, 'l.comment as note');
     // Handle cost.

-    $includeCost = $bean->getAttribute('chcost');
+    $includeCost = $options['show_cost'];

     if ($includeCost) {
       if (MODE_TIME == $user->tracking_mode)
         array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost");   // Use default user rate.
     if ($includeCost) {
       if (MODE_TIME == $user->tracking_mode)
         array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost");   // Use default user rate.


@@ -276,376 +187,223 @@ class ttReportHelper {
         array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
       array_push($fields, "null as expense"); 
     }
         array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
       array_push($fields, "null as expense"); 
     }

+    // Add paid status.
+    if ($canViewReports && $options['show_paid'])
+      array_push($fields, 'l.paid as paid');
+    // Add IP address.
+    if ($canViewReports && $options['show_ip']) {
+      array_push($fields, 'l.created as created');
+      array_push($fields, 'l.created_ip as created_ip');
+      array_push($fields, 'l.modified as modified');
+      array_push($fields, 'l.modified_ip as modified_ip');
+    }

     // Add invoice name if it is selected.
     // Add invoice name if it is selected.

-    if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice'))
+    if (($canViewReports || $isClient) && $options['show_invoice'])

       array_push($fields, 'i.name as invoice');
 
     // Prepare sql query part for left joins.
     $left_joins = null;
       array_push($fields, 'i.name as invoice');
 
     // Prepare sql query part for left joins.
     $left_joins = null;

-    if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
+    if ($options['show_client'] || 'client' == $group_by_option)

       $left_joins .= " left join tt_clients c on (c.id = l.client_id)";
       $left_joins .= " left join tt_clients c on (c.id = l.client_id)";

-    if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice'))
+    if (($canViewReports || $isClient) && $options['show_invoice'])

       $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)";
       $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)";

-    if ($user->canManageTeam() || $user->isClient() || in_array('ex', explode(',', $user->plugins)))
+    if ($canViewReports || $isClient || $user->isPluginEnabled('ex'))

        $left_joins .= " left join tt_users u on (u.id = l.user_id)";
        $left_joins .= " left join tt_users u on (u.id = l.user_id)";

-    if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
-      $left_joins .= " left join tt_projects p on (p.id = l.project_id)";      
-    if ($bean->getAttribute('chtask') || 'task' == $group_by_option)
-      $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";            
+    if ($options['show_project'] || 'project' == $group_by_option)
+      $left_joins .= " left join tt_projects p on (p.id = l.project_id)";
+    if ($options['show_task'] || 'task' == $group_by_option)
+      $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";

     if ($include_cf_1) {
       if ($cf_1_type == CustomFields::TYPE_TEXT)
         $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
     if ($include_cf_1) {
       if ($cf_1_type == CustomFields::TYPE_TEXT)
         $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";

-      else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+      elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {

         $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
           " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
       }
     }
     if ($includeCost && MODE_TIME != $user->tracking_mode)
       $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
         $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
           " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
       }
     }
     if ($includeCost && MODE_TIME != $user->tracking_mode)
       $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";

-    
-    $where = ttReportHelper::getWhere($bean);
-    
-    // Construct sql query for tt_log items.    
+
+    $where = ttReportHelper::getWhere($options);
+
+    // Construct sql query for tt_log items.

     $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
     // If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need,
     // with an exception of sorting part, that is added in the end.
 
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
     $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
     // If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need,
     // with an exception of sorting part, that is added in the end.
 
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.

-    if ($bean->getAttribute('chcost') && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled
-    
+    if ($options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
+

       $fields = array(); // An array of fields for database query.
       array_push($fields, 'ei.id');
       array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
       array_push($fields, 'ei.date');
       $fields = array(); // An array of fields for database query.
       array_push($fields, 'ei.id');
       array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
       array_push($fields, 'ei.date');

-      if($user->canManageTeam() || $user->isClient())
+      if($canViewReports || $isClient)

         array_push($fields, 'u.name as user');
       // Add client name if it is selected.
         array_push($fields, 'u.name as user');
       // Add client name if it is selected.

-      if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
+      if ($options['show_client'] || 'client' == $group_by_option)

         array_push($fields, 'c.name as client');
       // Add project name if it is selected.
         array_push($fields, 'c.name as client');
       // Add project name if it is selected.

-      if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
+      if ($options['show_project'] || 'project' == $group_by_option)

         array_push($fields, 'p.name as project');
         array_push($fields, 'p.name as project');

-      if ($bean->getAttribute('chtask') || 'task' == $group_by_option)
+      if ($options['show_task'] || 'task' == $group_by_option)

         array_push($fields, 'null'); // null for task name. We need to match column count for union.
         array_push($fields, 'null'); // null for task name. We need to match column count for union.

-      if ($bean->getAttribute('chcf_1') || 'cf_1' == $group_by_option)
+      if ($options['show_custom_field_1'] || 'cf_1' == $group_by_option)

         array_push($fields, 'null'); // null for cf_1.
         array_push($fields, 'null'); // null for cf_1.

-      if ($bean->getAttribute('chstart')) {
+      if ($options['show_start']) {

         array_push($fields, 'null'); // null for unformatted_start.
         array_push($fields, 'null'); // null for start.
       }
         array_push($fields, 'null'); // null for unformatted_start.
         array_push($fields, 'null'); // null for start.
       }

-      if ($bean->getAttribute('chfinish'))
+      if ($options['show_end'])

         array_push($fields, 'null'); // null for finish.
         array_push($fields, 'null'); // null for finish.

-      if ($bean->getAttribute('chduration'))
+      if ($options['show_duration'])

         array_push($fields, 'null'); // null for duration.
         array_push($fields, 'null'); // null for duration.

+      if ($options['show_work_units'])
+        array_push($fields, 'null as units'); // null for work units.

       // Use the note field to print item name.
       // Use the note field to print item name.

-      if ($bean->getAttribute('chnote'))
+      if ($options['show_note'])

         array_push($fields, 'ei.name as note');
       array_push($fields, 'ei.cost as cost');
       array_push($fields, 'ei.cost as expense');
         array_push($fields, 'ei.name as note');
       array_push($fields, 'ei.cost as cost');
       array_push($fields, 'ei.cost as expense');

+      // Add paid status.
+      if ($canViewReports && $options['show_paid'])
+        array_push($fields, 'ei.paid as paid');
+      // Add IP address.
+      if ($canViewReports && $options['show_ip']) {
+        array_push($fields, 'ei.created as created');
+        array_push($fields, 'ei.created_ip as created_ip');
+        array_push($fields, 'ei.modified as modified');
+        array_push($fields, 'ei.modified_ip as modified_ip');
+      }

       // Add invoice name if it is selected.
       // Add invoice name if it is selected.

-      if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice'))
+      if (($canViewReports || $isClient) && $options['show_invoice'])

         array_push($fields, 'i.name as invoice');
         array_push($fields, 'i.name as invoice');

-        
+

       // Prepare sql query part for left joins.
       $left_joins = null;
       // Prepare sql query part for left joins.
       $left_joins = null;

-      if ($user->canManageTeam() || $user->isClient())
+      if ($canViewReports || $isClient)

         $left_joins .= " left join tt_users u on (u.id = ei.user_id)";
         $left_joins .= " left join tt_users u on (u.id = ei.user_id)";

-      if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
+      if ($options['show_client'] || 'client' == $group_by_option)

         $left_joins .= " left join tt_clients c on (c.id = ei.client_id)";
         $left_joins .= " left join tt_clients c on (c.id = ei.client_id)";

-      if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
-        $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";         
-      if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice'))
+      if ($options['show_project'] || 'project' == $group_by_option)
+        $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
+      if (($canViewReports || $isClient) && $options['show_invoice'])

         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
 
         $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
 

-      $where = ttReportHelper::getExpenseWhere($bean);
-      
+      $where = ttReportHelper::getExpenseWhere($options);
+

       // Construct sql query for expense items.
       $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";
       // Construct sql query for expense items.
       $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";

-      
+

       // Construct a union.
       $sql = "($sql) union all ($sql_for_expense_items)";
     }
       // Construct a union.
       $sql = "($sql) union all ($sql_for_expense_items)";
     }

-    
+

     // Determine sort part.
     $sort_part = ' order by ';
     // Determine sort part.
     $sort_part = ' order by ';

-    if ('no_grouping' == $group_by_option || 'date' == $group_by_option)
+    if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option)

       $sort_part .= 'date';
     else
       $sort_part .= $group_by_option.', date';
       $sort_part .= 'date';
     else
       $sort_part .= $group_by_option.', date';

-    if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option)
+    if (($canViewReports || $isClient) && $options['users'] && 'user' != $group_by_option)

       $sort_part .= ', user, type';
       $sort_part .= ', user, type';

-    if ($bean->getAttribute('chstart'))
+    if ($options['show_start'])

       $sort_part .= ', unformatted_start';
     $sort_part .= ', id';
       $sort_part .= ', unformatted_start';
     $sort_part .= ', id';

-    
+

     $sql .= $sort_part;
     // By now we are ready with sql.
 
     // Obtain items for report.
     $res = $mdb2->query($sql);
     $sql .= $sort_part;
     // By now we are ready with sql.
 
     // Obtain items for report.
     $res = $mdb2->query($sql);

-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-          if ($convertTo12Hour) {
-            if($val['start'] != '')
-              $val['start'] = ttTimeHelper::to12HourFormat($val['start']);
-            if($val['finish'] != '')
-              $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']);
-          }
-             if (isset($val['cost'])) {
-            if ('.' != $user->decimal_mark)
-                 $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
-             }
-          if (isset($val['expense'])) {
-            if ('.' != $user->decimal_mark)
-                 $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
-             }
-             if ('no_grouping' != $group_by_option) {
-            $val['grouped_by'] = $val[$group_by_option];
-            if ('date' == $group_by_option) {
-              // This is needed to get the date in user date format.
-              $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']);
-              $val['grouped_by'] = $o_date->toString($user->date_format);
-              unset($o_date);
-            }
-             }
-            
+    if (is_a($res, 'PEAR_Error')) die($res->getMessage());
+
+    while ($val = $res->fetchRow()) {
+      if ($convertTo12Hour) {
+        if($val['start'] != '')
+          $val['start'] = ttTimeHelper::to12HourFormat($val['start']);
+        if($val['finish'] != '')
+          $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']);
+      }
+      if (isset($val['cost'])) {
+        if ('.' != $user->decimal_mark)
+          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+      }
+      if (isset($val['expense'])) {
+        if ('.' != $user->decimal_mark)
+          $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
+      }
+      if ('no_grouping' != $group_by_option) {
+        $val['grouped_by'] = $val[$group_by_option];
+        if ('date' == $group_by_option) {

           // This is needed to get the date in user date format.
           // This is needed to get the date in user date format.

-          $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']);
-          $val['date'] = $o_date->toString($user->date_format);
+          $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']);
+          $val['grouped_by'] = $o_date->toString($user->date_format);

           unset($o_date);
           unset($o_date);

-
-          $row = $val;
-          $report_items[] = $row;

         }
         }

-      } else
-           die($res->getMessage());
-
-    return $report_items;
-  }
-  
-  // getFavItems retrieves all items associated with a favorite report.
-  // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all.
-  // Expense items use the "note" field for item name.
-  static function getFavItems($report) {
-    global $user;
-    $mdb2 = getConnection();
-    
-    $group_by_option = $report['group_by'];
-    $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($report['show_start'] || $report['show_end']);
-    
-    // Prepare a query for time items in tt_log table.
-    $fields = array(); // An array of fields for database query.
-    array_push($fields, 'l.id as id');
-    array_push($fields, '1 as type'); // Type 1 is for tt_log entries.
-    array_push($fields, 'l.date as date');
-    if($user->canManageTeam() || $user->isClient())
-      array_push($fields, 'u.name as user');
-    // Add client name if it is selected.
-    if ($report['show_client'] || 'client' == $group_by_option)
-      array_push($fields, 'c.name as client');
-    // Add project name if it is selected.
-    if ($report['show_project'] || 'project' == $group_by_option)
-      array_push($fields, 'p.name as project');
-    // Add task name if it is selected.
-    if ($report['show_task'] || 'task' == $group_by_option)
-      array_push($fields, 't.name as task');
-    // Add custom field.
-    $include_cf_1 = $report['show_custom_field_1'] || 'cf_1' == $group_by_option;
-    if ($include_cf_1) {
-      $custom_fields = new CustomFields($user->team_id);
-      $cf_1_type = $custom_fields->fields[0]['type'];
-      if ($cf_1_type == CustomFields::TYPE_TEXT) {
-        array_push($fields, 'cfl.value as cf_1');      
-      } else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-           array_push($fields, 'cfo.value as cf_1');   

       }
       }

-    }
-    // Add start time.
-    if ($report['show_start']) {
-      array_push($fields, "l.start as unformatted_start");
-      array_push($fields, "TIME_FORMAT(l.start, '%k:%i') as start");
-    }
-    // Add finish time.
-    if ($report['show_end'])
-      array_push($fields, "TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), '%k:%i') as finish");
-    // Add duration.
-    if ($report['show_duration'])
-      array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
-    // Add note.
-    if ($report['show_note'])
-      array_push($fields, 'l.comment as note');
-    // Handle cost.
-    $includeCost = $report['show_cost'];
-    if ($includeCost) {
-      if (MODE_TIME == $user->tracking_mode)
-        array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost");   // Use default user rate.
-      else
-        array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
-      array_push($fields, "null as expense"); 
-    }
-    // Add invoice name if it is selected.
-    if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice'])
-      array_push($fields, 'i.name as invoice');

 
 

-    // Prepare sql query part for left joins.
-    $left_joins = null;
-    if ($report['show_client'] || 'client' == $group_by_option)
-      $left_joins .= " left join tt_clients c on (c.id = l.client_id)";
-    if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice'])
-      $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)";
-    if ($user->canManageTeam() || $user->isClient() || in_array('ex', explode(',', $user->plugins)))
-       $left_joins .= " left join tt_users u on (u.id = l.user_id)";
-    if ($report['show_project'] || 'project' == $group_by_option)
-      $left_joins .= " left join tt_projects p on (p.id = l.project_id)";      
-    if ($report['show_task'] || 'task' == $group_by_option)
-      $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";            
-    if ($include_cf_1) {
-      if ($cf_1_type == CustomFields::TYPE_TEXT)
-        $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
-      else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
-        $left_joins .=  " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
-          " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
-      }
+      // This is needed to get the date in user date format.
+      $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']);
+      $val['date'] = $o_date->toString($user->date_format);
+      unset($o_date);
+
+      $row = $val;
+      $report_items[] = $row;

     }
     }

-    if ($includeCost && MODE_TIME != $user->tracking_mode)
-      $left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
-    
-    $where = ttReportHelper::getFavWhere($report);
-    
-    // Construct sql query for tt_log items.    
-    $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
-    // If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need,
-    // with an exception of sorting part, that is added in the end.

 
 

-    // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
-    if ($report['show_cost'] && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled
-    
-      $fields = array(); // An array of fields for database query.
-      array_push($fields, 'ei.id');
-      array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
-      array_push($fields, 'ei.date');
-      if($user->canManageTeam() || $user->isClient())
-        array_push($fields, 'u.name as user');
-      // Add client name if it is selected.
-      if ($report['show_client'] || 'client' == $group_by_option)
-        array_push($fields, 'c.name as client');
-      // Add project name if it is selected.
-      if ($report['show_project'] || 'project' == $group_by_option)
-        array_push($fields, 'p.name as project');
-      if ($report['show_task'] || 'task' == $group_by_option)
-        array_push($fields, 'null'); // null for task name. We need to match column count for union.
-      if ($report['show_custom_field_1'] || 'cf_1' == $group_by_option)
-        array_push($fields, 'null'); // null for cf_1.
-      if ($report['show_start']) {
-        array_push($fields, 'null'); // null for unformatted_start.
-        array_push($fields, 'null'); // null for start.
-      }
-      if ($report['show_end'])
-        array_push($fields, 'null'); // null for finish.
-      if ($report['show_duration'])
-        array_push($fields, 'null'); // null for duration.
-      // Use the note field to print item name.
-      if ($report['show_note'])
-        array_push($fields, 'ei.name as note');
-      array_push($fields, 'ei.cost as cost');
-      array_push($fields, 'ei.cost as expense');
-      // Add invoice name if it is selected.
-      if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice'])
-        array_push($fields, 'i.name as invoice');
-        
-      // Prepare sql query part for left joins.
-      $left_joins = null;
-      if ($user->canManageTeam() || $user->isClient())
-        $left_joins .= " left join tt_users u on (u.id = ei.user_id)";
-      if ($report['show_client'] || 'client' == $group_by_option)
-        $left_joins .= " left join tt_clients c on (c.id = ei.client_id)";
-      if ($report['show_project'] || 'project' == $group_by_option)
-        $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";         
-      if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice'])
-        $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
+    return $report_items;
+  }

 
 

-      $where = ttReportHelper::getFavExpenseWhere($report);
-      
-      // Construct sql query for expense items.
-      $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";
-      
-      // Construct a union.
-      $sql = "($sql) union all ($sql_for_expense_items)";
-    }
-    
-    // Determine sort part.
-    $sort_part = ' order by ';
-    if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option) // TODO: fix DB for NULL values in group_by field.
-      $sort_part .= 'date';
-    else
-      $sort_part .= $group_by_option.', date';
-    if (($user->canManageTeam() || $user->isClient()) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option)
-      $sort_part .= ', user, type';
-    if ($report['show_start'])
-      $sort_part .= ', unformatted_start';
-    $sort_part .= ', id';
-    
-    $sql .= $sort_part;
-    // By now we are ready with sql.
+  // putInSession stores tt_log and tt_expense_items ids from a report in user session
+  // as 2 comma-separated lists.
+  static function putInSession($report_items) {
+    unset($_SESSION['report_item_ids']);
+    unset($_SESSION['report_item_expense_ids']);

 
 

-    // Obtain items for report.
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-          if ($convertTo12Hour) {
-            if($val['start'] != '')
-              $val['start'] = ttTimeHelper::to12HourFormat($val['start']);
-            if($val['finish'] != '')
-              $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']);
-          }
-             if (isset($val['cost'])) {
-            if ('.' != $user->decimal_mark)
-                 $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
-             }
-          if (isset($val['expense'])) {
-            if ('.' != $user->decimal_mark)
-                 $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
-             }
-             if ('no_grouping' != $group_by_option) {
-            $val['grouped_by'] = $val[$group_by_option];
-            if ('date' == $group_by_option) {
-              // This is needed to get the date in user date format.
-              $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']);
-              $val['grouped_by'] = $o_date->toString($user->date_format);
-              unset($o_date);
-            }
-             }
-            
-          // This is needed to get the date in user date format.
-          $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']);
-          $val['date'] = $o_date->toString($user->date_format);
-          unset($o_date);
+    // Iterate through records and build 2 comma-separated lists.
+    foreach($report_items as $item) {
+      if ($item['type'] == 1)
+        $report_item_ids .= ','.$item['id'];
+      else if ($item['type'] == 2)
+         $report_item_expense_ids .= ','.$item['id'];
+    }
+    $report_item_ids = trim($report_item_ids, ',');
+    $report_item_expense_ids = trim($report_item_expense_ids, ',');

 
 

-          $row = $val;
-          $report_items[] = $row;
-        }
-      } else
-           die($res->getMessage());
+    // The lists are reqdy. Put them in session.
+    if ($report_item_ids) $_SESSION['report_item_ids'] = $report_item_ids;
+    if ($report_item_expense_ids) $_SESSION['report_item_expense_ids'] = $report_item_expense_ids;
+  }

 
 

-    return $report_items;
+  // getFromSession obtains tt_log and tt_expense_items ids stored in user session.
+  static function getFromSession() {
+    $items = array();
+    $report_item_ids = $_SESSION['report_item_ids'];
+    if ($report_item_ids)
+      $items['report_item_ids'] = explode(',', $report_item_ids);
+    $report_item_expense_ids = $_SESSION['report_item_expense_ids'];
+    if ($report_item_expense_ids)
+      $items['report_item_expense_ids'] = explode(',', $report_item_expense_ids);
+    return $items;

   }
   }

-  
+

   // getSubtotals calculates report items subtotals when a report is grouped by.
   // Without expenses, it's a simple select with group by.
   // With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
   // getSubtotals calculates report items subtotals when a report is grouped by.
   // Without expenses, it's a simple select with group by.
   // With expenses, it becomes a select with group by from a combined set of records obtained with "union all".

-  static function getSubtotals($bean) {
-       global $user;
-       
+  static function getSubtotals($bean, $options) {
+    global $user;
+

     $group_by_option = $bean->getAttribute('group_by');
     if ('no_grouping' == $group_by_option) return null;
     $group_by_option = $bean->getAttribute('group_by');
     if ('no_grouping' == $group_by_option) return null;

-    
+

     $mdb2 = getConnection();
     $mdb2 = getConnection();

-    
+

     // Start with sql to obtain subtotals for time items. This simple sql will be used when we have no expenses.
     // Start with sql to obtain subtotals for time items. This simple sql will be used when we have no expenses.

-    
+

     // Determine group by field and a required join.
     switch ($group_by_option) {
     // Determine group by field and a required join.
     switch ($group_by_option) {

-         case 'date':
+      case 'date':

         $group_field = 'l.date';
         $group_join = '';
         break;
         $group_field = 'l.date';
         $group_join = '';
         break;


@@ -658,54 +416,73 @@ class ttReportHelper {
         $group_join = 'left join tt_clients c on (l.client_id = c.id) ';
         break;
       case 'project':
         $group_join = 'left join tt_clients c on (l.client_id = c.id) ';
         break;
       case 'project':

-           $group_field = 'p.name';
+        $group_field = 'p.name';

         $group_join = 'left join tt_projects p on (l.project_id = p.id) ';
         $group_join = 'left join tt_projects p on (l.project_id = p.id) ';

-           break;
+        break;

       case 'task':
       case 'task':

-           $group_field = 't.name';
+        $group_field = 't.name';

         $group_join = 'left join tt_tasks t on (l.task_id = t.id) ';
         $group_join = 'left join tt_tasks t on (l.task_id = t.id) ';

-           break;
+        break;

       case 'cf_1':
       case 'cf_1':

-           $group_field = 'cfo.value';
-           $custom_fields = new CustomFields($user->team_id);
-           if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
+        $group_field = 'cfo.value';
+        $custom_fields = new CustomFields($user->group_id);
+        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)

           $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) ';
           $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) ';

-        else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)

           $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) ';
           $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) ';

-         break;
+        break;

     }
 
     }
 

-    $where = ttReportHelper::getWhere($bean);
+    $where = ttReportHelper::getWhere($options);

     if ($bean->getAttribute('chcost')) {
       if (MODE_TIME == $user->tracking_mode) {
     if ($bean->getAttribute('chcost')) {
       if (MODE_TIME == $user->tracking_mode) {

-       if ($group_by_option != 'user')
-         $left_join = 'left join tt_users u on (l.user_id = u.id)';
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, 
-          sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
+        if ($group_by_option != 'user')
+          $left_join = 'left join tt_users u on (l.user_id = u.id)';
+        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+        if ($bean->getAttribute('chunits')) {
+          if ($user->unit_totals_only)
+            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          else
+            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        }
+        $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,

           null as expenses from tt_log l
           null as expenses from tt_log l

-          $group_join $left_join $where group by $group_field";        
+          $group_join $left_join $where group by $group_field";

       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.

-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, 
-          sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
-          null as expenses from tt_log l 
+        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+        if ($bean->getAttribute('chunits')) {
+          if ($user->unit_totals_only)
+            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          else
+            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        }
+        $sql .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
+          null as expenses from tt_log l

           $group_join
           left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field";
       }
     } else {
           $group_join
           left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field";
       }
     } else {

-          $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, null as expenses from tt_log l 
-         $group_join $where group by $group_field";
+      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+      if ($bean->getAttribute('chunits')) {
+        if ($user->unit_totals_only)
+          $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        else
+          $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+      }
+      $sql .= ", null as expenses from tt_log l
+        $group_join $where group by $group_field";

     }
     // By now we have sql for time items.
     }
     // By now we have sql for time items.

-    
+

     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.

-    if ($bean->getAttribute('chcost') && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled
-       
+    if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
+

       // Determine group by field and a required join.
       $group_join = null;
       $group_field = 'null';
       switch ($group_by_option) {
       // Determine group by field and a required join.
       $group_join = null;
       $group_field = 'null';
       switch ($group_by_option) {

-           case 'date':
+        case 'date':

           $group_field = 'ei.date';
           $group_join = '';
           break;
           $group_field = 'ei.date';
           $group_join = '';
           break;


@@ -718,63 +495,66 @@ class ttReportHelper {
           $group_join = 'left join tt_clients c on (ei.client_id = c.id) ';
           break;
         case 'project':
           $group_join = 'left join tt_clients c on (ei.client_id = c.id) ';
           break;
         case 'project':

-             $group_field = 'p.name';
+          $group_field = 'p.name';

           $group_join = 'left join tt_projects p on (ei.project_id = p.id) ';
           $group_join = 'left join tt_projects p on (ei.project_id = p.id) ';

-             break;
+          break;

       }
 
       }
 

-      $where = ttReportHelper::getExpenseWhere($bean);
-      $sql_for_expenses = "select $group_field as group_field, null as time, sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei 
-        $group_join $where";
+      $where = ttReportHelper::getExpenseWhere($options);
+      $sql_for_expenses = "select $group_field as group_field, null as time";
+      if ($bean->getAttribute('chunits')) $sql_for_expenses .= ", null as units";
+      $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $group_join $where";

       // Add a "group by" clause if we are grouping.
       if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";
       // Add a "group by" clause if we are grouping.
       if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";

-         
+

       // Create a combined query.
       // Create a combined query.

-      $sql = "select group_field, sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
+      $combined = "select group_field, sum(time) as time";
+      if ($bean->getAttribute('chunits')) $combined .= ", sum(units) as units";
+      $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
+      $sql = $combined;

     }
     }

-    
+

     // Execute query.
     $res = $mdb2->query($sql);
     // Execute query.
     $res = $mdb2->query($sql);

-    if (!is_a($res, 'PEAR_Error')) {
-         while ($val = $res->fetchRow()) {
-               if ('date' == $group_by_option) {
-          // This is needed to get the date in user date format.
-          $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']);
-          $val['group_field'] = $o_date->toString($user->date_format);
-          unset($o_date);
-               }
-               $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
-        if ($bean->getAttribute('chcost')) {
-             if ('.' != $user->decimal_mark) {
-               $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
-               $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
-             }
-         $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time,'cost'=>$val['cost'],'expenses'=>$val['expenses']);
-        } else
-          $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time);
+    if (is_a($res, 'PEAR_Error')) die($res->getMessage());
+
+    while ($val = $res->fetchRow()) {
+      if ('date' == $group_by_option) {
+        // This is needed to get the date in user date format.
+        $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']);
+        $val['group_field'] = $o_date->toString($user->date_format);
+        unset($o_date);

       }
       }

-    } else
-      die($res->getMessage());
+      $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
+      if ($bean->getAttribute('chcost')) {
+        if ('.' != $user->decimal_mark) {
+          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+          $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
+        }
+        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units'],'cost'=>$val['cost'],'expenses'=>$val['expenses']);
+      } else
+        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units']);
+    }

 
     return $subtotals;
   }
 
     return $subtotals;
   }

-  
+

   // getFavSubtotals calculates report items subtotals when a favorite report is grouped by.
   // Without expenses, it's a simple select with group by.
   // With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
   // getFavSubtotals calculates report items subtotals when a favorite report is grouped by.
   // Without expenses, it's a simple select with group by.
   // With expenses, it becomes a select with group by from a combined set of records obtained with "union all".

-  static function getFavSubtotals($report) {
-       global $user;
-       
-    $group_by_option = $report['group_by'];
+  static function getFavSubtotals($options) {
+    global $user;
+
+    $group_by_option = $options['group_by'];

     if ('no_grouping' == $group_by_option) return null;
     if ('no_grouping' == $group_by_option) return null;

-    
+

     $mdb2 = getConnection();
     $mdb2 = getConnection();

-    
+

     // Start with sql to obtain subtotals for time items. This simple sql will be used when we have no expenses.
     // Start with sql to obtain subtotals for time items. This simple sql will be used when we have no expenses.

-    
+

     // Determine group by field and a required join.
     switch ($group_by_option) {
     // Determine group by field and a required join.
     switch ($group_by_option) {

-         case 'date':
+      case 'date':

         $group_field = 'l.date';
         $group_join = '';
         break;
         $group_field = 'l.date';
         $group_join = '';
         break;


@@ -787,54 +567,74 @@ class ttReportHelper {
         $group_join = 'left join tt_clients c on (l.client_id = c.id) ';
         break;
       case 'project':
         $group_join = 'left join tt_clients c on (l.client_id = c.id) ';
         break;
       case 'project':

-           $group_field = 'p.name';
+        $group_field = 'p.name';

         $group_join = 'left join tt_projects p on (l.project_id = p.id) ';
         $group_join = 'left join tt_projects p on (l.project_id = p.id) ';

-           break;
+        break;

       case 'task':
       case 'task':

-           $group_field = 't.name';
+        $group_field = 't.name';

         $group_join = 'left join tt_tasks t on (l.task_id = t.id) ';
         $group_join = 'left join tt_tasks t on (l.task_id = t.id) ';

-           break;
+        break;

       case 'cf_1':
       case 'cf_1':

-           $group_field = 'cfo.value';
-           $custom_fields = new CustomFields($user->team_id);
-           if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
+        $group_field = 'cfo.value';
+        $custom_fields = new CustomFields($user->group_id);
+        if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)

           $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) ';
           $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) ';

-        else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+        elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)

           $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) ';
           $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) ';

-         break;
+        break;

     }
 
     }
 

-    $where = ttReportHelper::getFavWhere($report);
-    if ($report['show_cost']) {
+    $where = ttReportHelper::getWhere($options);
+    if ($options['show_cost']) {

       if (MODE_TIME == $user->tracking_mode) {
       if (MODE_TIME == $user->tracking_mode) {

-       if ($group_by_option != 'user')
-         $left_join = 'left join tt_users u on (l.user_id = u.id)';
-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, 
-          sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
+        if ($group_by_option != 'user')
+          $left_join = 'left join tt_users u on (l.user_id = u.id)';
+          $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+          if ($options['show_work_units']) {
+            if ($user->unit_totals_only)
+              $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+            else
+              $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          }
+          $sql .= ", sum(if(l.billable = 0 or  time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,

           null as expenses from tt_log l
           null as expenses from tt_log l

-          $group_join $left_join $where group by $group_field";        
+          $group_join $left_join $where group by $group_field";

       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
       } else {
         // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.

-        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, 
-          sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
+        $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+        if ($options['show_work_units']) {
+          if ($user->unit_totals_only)
+            $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+          else
+            $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        }
+        $sql .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,

           null as expenses from tt_log l 
           $group_join
           left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field";
       }
     } else {
           null as expenses from tt_log l 
           $group_join
           left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field";
       }
     } else {

-          $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, null as expenses from tt_log l 
-         $group_join $where group by $group_field";
+      $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
+      if ($options['show_work_units']) {
+        if ($user->unit_totals_only)
+          $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+        else
+          $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+      }
+      $sql .= ", null as expenses from tt_log l 
+        $group_join $where group by $group_field";

     }
     // By now we have sql for time items.
     }
     // By now we have sql for time items.

-    
+

     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.

-    if ($report['show_cost'] && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled
-       
+    if ($options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
+

       // Determine group by field and a required join.
       $group_join = null;
       $group_field = 'null';
       switch ($group_by_option) {
       // Determine group by field and a required join.
       $group_join = null;
       $group_field = 'null';
       switch ($group_by_option) {

-           case 'date':
+        case 'date':

           $group_field = 'ei.date';
           $group_join = '';
           break;
           $group_field = 'ei.date';
           $group_join = '';
           break;


@@ -847,268 +647,231 @@ class ttReportHelper {
           $group_join = 'left join tt_clients c on (ei.client_id = c.id) ';
           break;
         case 'project':
           $group_join = 'left join tt_clients c on (ei.client_id = c.id) ';
           break;
         case 'project':

-             $group_field = 'p.name';
+          $group_field = 'p.name';

           $group_join = 'left join tt_projects p on (ei.project_id = p.id) ';
           $group_join = 'left join tt_projects p on (ei.project_id = p.id) ';

-             break;
+          break;

       }
 
       }
 

-      $where = ttReportHelper::getFavExpenseWhere($report);
-      $sql_for_expenses = "select $group_field as group_field, null as time, sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei 
-        $group_join $where";
+      $where = ttReportHelper::getExpenseWhere($options);
+      $sql_for_expenses = "select $group_field as group_field, null as time";
+      if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
+      $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $group_join $where";

       // Add a "group by" clause if we are grouping.
       if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";
       // Add a "group by" clause if we are grouping.
       if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";

-         
+

       // Create a combined query.
       // Create a combined query.

-      $sql = "select group_field, sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
+      $combined = "select group_field, sum(time) as time";
+      if ($options['show_work_units']) $combined .= ", sum(units) as units";
+      $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
+      $sql = $combined;

     }
     }

-    
+

     // Execute query.
     $res = $mdb2->query($sql);
     // Execute query.
     $res = $mdb2->query($sql);

-    if (!is_a($res, 'PEAR_Error')) {
-         while ($val = $res->fetchRow()) {
-               if ('date' == $group_by_option) {
-          // This is needed to get the date in user date format.
-          $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']);
-          $val['group_field'] = $o_date->toString($user->date_format);
-          unset($o_date);
-               }
-               $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
-        if ($report['show_cost']) {
-             if ('.' != $user->decimal_mark) {
-               $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
-               $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
-             }
-         $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time,'cost'=>$val['cost'],'expenses'=>$val['expenses']);
-        } else
-          $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time);
+    if (is_a($res, 'PEAR_Error')) die($res->getMessage());
+
+    while ($val = $res->fetchRow()) {
+      if ('date' == $group_by_option) {
+        // This is needed to get the date in user date format.
+        $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']);
+        $val['group_field'] = $o_date->toString($user->date_format);
+        unset($o_date);

       }
       }

-    } else
-      die($res->getMessage());
+      $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
+      if ($options['show_cost']) {
+        if ('.' != $user->decimal_mark) {
+          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+          $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
+        }
+        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units'], 'cost'=>$val['cost'],'expenses'=>$val['expenses']);
+      } else
+        $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units']);
+    }

 
     return $subtotals;
   }
 
     return $subtotals;
   }

-  
+

   // getTotals calculates total hours and cost for all report items.
   // getTotals calculates total hours and cost for all report items.

-  static function getTotals($bean)
+  static function getTotals($options)

   {
     global $user;
   {
     global $user;

-    
-    $mdb2 = getConnection();
-    
-    $where = ttReportHelper::getWhere($bean);
-       
-    // Start with a query for time items.
-    if ($bean->getAttribute('chcost')) {
-      if (MODE_TIME == $user->tracking_mode) {
-        $sql = "select sum(time_to_sec(l.duration)) as time,
-          sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
-          null as expenses 
-          from tt_log l
-          left join tt_users u on (l.user_id = u.id) $where";
-      } else {
-        $sql = "select sum(time_to_sec(l.duration)) as time,
-          sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
-          null as expenses
-          from tt_log l
-          left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where";          
-      }
-    } else
-      $sql = "select sum(time_to_sec(l.duration)) as time, null as cost, null as expenses from tt_log l $where";
-      
-    // If we have expenses, query becomes a bit more complex.
-    if ($bean->getAttribute('chcost') && in_array('ex', explode(',', $user->plugins))) {
-      $where = ttReportHelper::getExpenseWhere($bean);
-      $sql_for_expenses = "select null as time, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
-      // Create a combined query.
-      $sql = "select sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
-       }

 
 

-       // Execute query.
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
-      if ($bean->getAttribute('chcost')) {
-       $total_cost = $val['cost'];
-       if (!$total_cost) $total_cost = '0.00';
-       if ('.' != $user->decimal_mark)
-             $total_cost = str_replace('.', $user->decimal_mark, $total_cost);
-             
-           $total_expenses = $val['expenses'];
-       if (!$total_expenses) $total_expenses = '0.00';
-       if ('.' != $user->decimal_mark)
-             $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses);
-      }
-    } else
-      die($res->getMessage());
-      
-    if ($bean->getAttribute('period'))
-      $period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format));
-    else {
-      $period = new Period();
-      $period->setPeriod(
-        new DateAndTime($user->date_format, $bean->getAttribute('start_date')),
-        new DateAndTime($user->date_format, $bean->getAttribute('end_date')));
-    }
+    $mdb2 = getConnection();

 
 

-    $totals['start_date'] = $period->getBeginDate();
-       $totals['end_date'] = $period->getEndDate();
-       $totals['time'] = $total_time;
-       $totals['cost'] = $total_cost;
-       $totals['expenses'] = $total_expenses;
+    $where = ttReportHelper::getWhere($options);

 
 

-    return $totals;
-  }
-  
-  // getFavTotals calculates total hours and cost for all favorite report items.
-  static function getFavTotals($report)
-  {
-    global $user;
-    
-    $mdb2 = getConnection();
-    
-    $where = ttReportHelper::getFavWhere($report);
-       
-    // Start with a query for time items.
-    if ($report['show_cost']) {
+    // Prepare parts.
+    $time_part = "sum(time_to_sec(l.duration)) as time";
+    if ($options['show_work_units']) {
+      $units_part = $user->unit_totals_only ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+    }
+    if ($options['show_cost']) {
+      if (MODE_TIME == $user->tracking_mode)
+        $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
+      else
+        $cost_part = ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
+    } else {
+      $cost_part = ", null as cost, null as expenses";
+    }
+    if ($options['show_cost']) {

       if (MODE_TIME == $user->tracking_mode) {
       if (MODE_TIME == $user->tracking_mode) {

-        $sql = "select sum(time_to_sec(l.duration)) as time,
-          sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
-          null as expenses 
-          from tt_log l
-          left join tt_users u on (l.user_id = u.id) $where";
+        $left_joins = "left join tt_users u on (l.user_id = u.id)";

       } else {
       } else {

-        $sql = "select sum(time_to_sec(l.duration)) as time,
-          sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
-          null as expenses
-          from tt_log l
-          left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where";          
+        $left_joins = "left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";

       }
       }

-    } else
-      $sql = "select sum(time_to_sec(l.duration)) as time, null as cost, null as expenses from tt_log l $where";
-      
+    }
+    // Prepare a query for time items.
+    $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $where";
+

     // If we have expenses, query becomes a bit more complex.
     // If we have expenses, query becomes a bit more complex.

-    if ($report['show_cost'] && in_array('ex', explode(',', $user->plugins))) {
-      $where = ttReportHelper::getFavExpenseWhere($report);
-      $sql_for_expenses = "select null as time, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
+    if ($options['show_cost'] && $user->isPluginEnabled('ex')) {
+      $where = ttReportHelper::getExpenseWhere($options);
+      $sql_for_expenses = "select null as time";
+      if ($options['show_work_units']) $sql_for_expenses .= ", null as units";
+      $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where";
+

       // Create a combined query.
       // Create a combined query.

-      $sql = "select sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
-       }
+      $combined = "select sum(time) as time";
+      if ($options['show_work_units']) $combined .= ", sum(units) as units";
+      $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t";
+      $sql = $combined;
+    }

 
 

-       // Execute query.
+    // Execute query.

     $res = $mdb2->query($sql);
     $res = $mdb2->query($sql);

-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
-      if ($report['show_cost']) {
-       $total_cost = $val['cost'];
-       if (!$total_cost) $total_cost = '0.00';
-       if ('.' != $user->decimal_mark)
-             $total_cost = str_replace('.', $user->decimal_mark, $total_cost);
-             
-           $total_expenses = $val['expenses'];
-       if (!$total_expenses) $total_expenses = '0.00';
-       if ('.' != $user->decimal_mark)
-             $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses);
-      }
-    } else
-      die($res->getMessage());
-      
-    if ($report['period'])
-      $period = new Period($report['period'], new DateAndTime($user->date_format));
+    if (is_a($res, 'PEAR_Error')) die($res->getMessage());
+
+    $val = $res->fetchRow();
+    $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
+    if ($options['show_cost']) {
+      $total_cost = $val['cost'];
+      if (!$total_cost) $total_cost = '0.00';
+      if ('.' != $user->decimal_mark)
+        $total_cost = str_replace('.', $user->decimal_mark, $total_cost);
+      $total_expenses = $val['expenses'];
+      if (!$total_expenses) $total_expenses = '0.00';
+      if ('.' != $user->decimal_mark)
+        $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses);
+    }
+
+    if ($options['period'])
+      $period = new Period($options['period'], new DateAndTime($user->date_format));

     else {
       $period = new Period();
       $period->setPeriod(
     else {
       $period = new Period();
       $period->setPeriod(

-        new DateAndTime($user->date_format, $report['period_start']),
-        new DateAndTime($user->date_format, $report['period_end']));
+        new DateAndTime($user->date_format, $options['period_start']),
+        new DateAndTime($user->date_format, $options['period_end']));

     }
 
     }
 

-    $totals['start_date'] = $period->getBeginDate();
-       $totals['end_date'] = $period->getEndDate();
-       $totals['time'] = $total_time;
-       $totals['cost'] = $total_cost;
-       $totals['expenses'] = $total_expenses;
+    $totals['start_date'] = $period->getStartDate();
+    $totals['end_date'] = $period->getEndDate();
+    $totals['time'] = $total_time;
+    $totals['units'] = $val['units'];
+    $totals['cost'] = $total_cost;
+    $totals['expenses'] = $total_expenses;

 
     return $totals;
   }
 
     return $totals;
   }

-  
+

   // The assignToInvoice assigns a set of records to a specific invoice.
   static function assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids)
   {
   // The assignToInvoice assigns a set of records to a specific invoice.
   static function assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids)
   {

-       $mdb2 = getConnection();
-       if ($time_log_ids) {
+    $mdb2 = getConnection();
+    if ($time_log_ids) {

       $sql = "update tt_log set invoice_id = ".$mdb2->quote($invoice_id).
         " where id in(".join(', ', $time_log_ids).")";
       $affected = $mdb2->exec($sql);
       $sql = "update tt_log set invoice_id = ".$mdb2->quote($invoice_id).
         " where id in(".join(', ', $time_log_ids).")";
       $affected = $mdb2->exec($sql);

-      if (is_a($affected, 'PEAR_Error'))
-           die($affected->getMessage());
-       }
+      if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+    }

     if ($expense_item_ids) {
       $sql = "update tt_expense_items set invoice_id = ".$mdb2->quote($invoice_id).
         " where id in(".join(', ', $expense_item_ids).")";
       $affected = $mdb2->exec($sql);
     if ($expense_item_ids) {
       $sql = "update tt_expense_items set invoice_id = ".$mdb2->quote($invoice_id).
         " where id in(".join(', ', $expense_item_ids).")";
       $affected = $mdb2->exec($sql);

-      if (is_a($affected, 'PEAR_Error'))
-           die($affected->getMessage());
-       }
+      if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+    }
+  }
+
+  // The markPaid marks a set of records as either paid or unpaid.
+  static function markPaid($time_log_ids, $expense_item_ids, $paid = true)
+  {
+    $mdb2 = getConnection();
+    $paid_val = (int) $paid;
+    if ($time_log_ids) {
+      $sql = "update tt_log set paid = $paid_val where id in(".join(', ', $time_log_ids).")";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+    }
+    if ($expense_item_ids) {
+      $sql = "update tt_expense_items set paid = $paid_val where id in(".join(', ', $expense_item_ids).")";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+    }

   }
 
   // prepareReportBody - prepares an email body for report.
   static function prepareReportBody($bean, $comment)
   {
   }
 
   // prepareReportBody - prepares an email body for report.
   static function prepareReportBody($bean, $comment)
   {

-       global $user;
-       global $i18n;
+    global $user;
+    global $i18n;
+
+    // Determine these once as they are used in multiple places in this function.
+    $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
+    $isClient = $user->isClient();
+    $options = ttReportHelper::getReportOptions($bean);

 
 

-    $items = ttReportHelper::getItems($bean);
+    $items = ttReportHelper::getItems($options);

     $group_by = $bean->getAttribute('group_by');
     if ($group_by && 'no_grouping' != $group_by)
     $group_by = $bean->getAttribute('group_by');
     if ($group_by && 'no_grouping' != $group_by)

-        $subtotals = ttReportHelper::getSubtotals($bean);
-    $totals = ttReportHelper::getTotals($bean);
-    
+      $subtotals = ttReportHelper::getSubtotals($bean, $options);
+    $totals = ttReportHelper::getTotals($options);
+

     // Use custom fields plugin if it is enabled.
     // Use custom fields plugin if it is enabled.

-    if (in_array('cf', explode(',', $user->plugins)))
-      $custom_fields = new CustomFields($user->team_id);
+    if ($user->isPluginEnabled('cf'))
+      $custom_fields = new CustomFields($user->group_id);

 
     // Define some styles to use in email.
     $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
     $tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
     $tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';
 
     // Define some styles to use in email.
     $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
     $tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
     $tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';

-    $rowItem = 'background-color: #ccccce;';
+    $rowItem = 'background-color: #ffffff;';

     $rowItemAlt = 'background-color: #f5f5f5;';
     $rowSubtotal = 'background-color: #e0e0e0;';
     $cellLeftAligned = 'text-align: left; vertical-align: top;';
     $cellRightAligned = 'text-align: right; vertical-align: top;';
     $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;';
     $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;';
     $rowItemAlt = 'background-color: #f5f5f5;';
     $rowSubtotal = 'background-color: #e0e0e0;';
     $cellLeftAligned = 'text-align: left; vertical-align: top;';
     $cellRightAligned = 'text-align: right; vertical-align: top;';
     $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;';
     $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;';

-    
+

     // Start creating email body.
     $body = '<html>';
     $body .= '<head><meta http-equiv="content-type" content="text/html; charset='.CHARSET.'"></head>';
     $body .= '<body>';
     // Start creating email body.
     $body = '<html>';
     $body .= '<head><meta http-equiv="content-type" content="text/html; charset='.CHARSET.'"></head>';
     $body .= '<body>';

-    
+

     // Output title.
     // Output title.

-    $body .= '<p style="'.$style_title.'">'.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
-    
+    $body .= '<p style="'.$style_title.'">'.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
+

     // Output comment.
     if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>';
 
     if ($bean->getAttribute('chtotalsonly')) {
       // Totals only report. Output subtotals.
     // Output comment.
     if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>';
 
     if ($bean->getAttribute('chtotalsonly')) {
       // Totals only report. Output subtotals.

-      
+

       // Determine group_by header.
       if ('cf_1' == $group_by)
         $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']);
       else {
         $key = 'label.'.$group_by;
       // Determine group_by header.
       if ('cf_1' == $group_by)
         $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']);
       else {
         $key = 'label.'.$group_by;

-        $group_by_header = $i18n->getKey($key);
+        $group_by_header = $i18n->get($key);

       }
       }

-       
+

       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
       $body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
       if ($bean->getAttribute('chduration'))
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
       $body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
       if ($bean->getAttribute('chduration'))

-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
+      if ($bean->getAttribute('chunits'))
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';

       if ($bean->getAttribute('chcost'))
       if ($bean->getAttribute('chcost'))

-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';

       $body .= '</tr>';
       foreach($subtotals as $subtotal) {
         $body .= '<tr style="'.$rowSubtotal.'">';
       $body .= '</tr>';
       foreach($subtotals as $subtotal) {
         $body .= '<tr style="'.$rowSubtotal.'">';


@@ -1118,62 +881,78 @@ class ttReportHelper {
           if ($subtotal['time'] <> '0:00') $body .= $subtotal['time'];
           $body .= '</td>';
         }
           if ($subtotal['time'] <> '0:00') $body .= $subtotal['time'];
           $body .= '</td>';
         }

+        if ($bean->getAttribute('chunits')) {
+          $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
+          $body .= $subtotal['units'];
+          $body .= '</td>';
+        }

         if ($bean->getAttribute('chcost')) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
         if ($bean->getAttribute('chcost')) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';

-          $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses'];
+          $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];

           $body .= '</td>';
         }
         $body .= '</tr>';
       }
           $body .= '</td>';
         }
         $body .= '</tr>';
       }

-      
+

       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';
       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';

-      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
+      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';

       if ($bean->getAttribute('chduration')) {
       if ($bean->getAttribute('chduration')) {

-       $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-       if ($totals['time'] <> '0:00') $body .= $totals['time'];
-       $body .= '</td>';
+        $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
+        if ($totals['time'] <> '0:00') $body .= $totals['time'];
+        $body .= '</td>';
+      }
+      if ($bean->getAttribute('chunits')) {
+        $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
+        $body .= $totals['units'];
+        $body .= '</td>';

       }
       if ($bean->getAttribute('chcost')) {
       }
       if ($bean->getAttribute('chcost')) {

-       $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
-        $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
-       $body .= '</td>';
+        $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
+        $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
+        $body .= '</td>';

       }
       $body .= '</tr>';
       }
       $body .= '</tr>';

-       
+

       $body .= '</table>';
     } else {
       // Regular report.
       $body .= '</table>';
     } else {
       // Regular report.

-      
+

       // Print table header.
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
       // Print table header.
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';

-      $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.date').'</td>';
-      if ($user->canManageTeam() || $user->isClient())
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.user').'</td>';
+      $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.date').'</td>';
+      if ($canViewReports || $isClient)
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.user').'</td>';

       if ($bean->getAttribute('chclient'))
       if ($bean->getAttribute('chclient'))

-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.client').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.client').'</td>';

       if ($bean->getAttribute('chproject'))
       if ($bean->getAttribute('chproject'))

-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.project').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.project').'</td>';

       if ($bean->getAttribute('chtask'))
       if ($bean->getAttribute('chtask'))

-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.task').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.task').'</td>';

       if ($bean->getAttribute('chcf_1'))
         $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>';
       if ($bean->getAttribute('chstart'))
       if ($bean->getAttribute('chcf_1'))
         $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>';
       if ($bean->getAttribute('chstart'))

-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.start').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.start').'</td>';

       if ($bean->getAttribute('chfinish'))
       if ($bean->getAttribute('chfinish'))

-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.finish').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.finish').'</td>';

       if ($bean->getAttribute('chduration'))
       if ($bean->getAttribute('chduration'))

-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
+      if ($bean->getAttribute('chunits'))
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';

       if ($bean->getAttribute('chnote'))
       if ($bean->getAttribute('chnote'))

-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.note').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';

       if ($bean->getAttribute('chcost'))
       if ($bean->getAttribute('chcost'))

-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
+      if ($bean->getAttribute('chpaid'))
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.paid').'</td>';
+      if ($bean->getAttribute('chip'))
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.ip').'</td>';

       if ($bean->getAttribute('chinvoice'))
       if ($bean->getAttribute('chinvoice'))

-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.invoice').'</td>';
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.invoice').'</td>';

       $body .= '</tr>';
       $body .= '</tr>';

-      
+

       // Initialize variables to print subtotals.
       if ($items && 'no_grouping' != $group_by) {
         $print_subtotals = true;
       // Initialize variables to print subtotals.
       if ($items && 'no_grouping' != $group_by) {
         $print_subtotals = true;


@@ -1185,7 +964,7 @@ class ttReportHelper {
       $prev_date = '';
       $cur_date = '';
       $row_style = $rowItem;
       $prev_date = '';
       $cur_date = '';
       $row_style = $rowItem;

-      
+

       // Print report items.
       if (is_array($items)) {
         foreach ($items as $record) {
       // Print report items.
       if (is_array($items)) {
         foreach ($items as $record) {


@@ -1195,9 +974,9 @@ class ttReportHelper {
             $cur_grouped_by = $record['grouped_by'];
             if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
               $body .= '<tr style="'.$rowSubtotal.'">';
             $cur_grouped_by = $record['grouped_by'];
             if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
               $body .= '<tr style="'.$rowSubtotal.'">';

-              $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+              $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';

               $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
               $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);

-              if ($user->canManageTeam() || $user->isClient()) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
+              if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';

               if ($bean->getAttribute('chclient')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
               if ($bean->getAttribute('chproject')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
               if ($bean->getAttribute('chtask')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
               if ($bean->getAttribute('chclient')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
               if ($bean->getAttribute('chproject')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
               if ($bean->getAttribute('chtask')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';


@@ -1205,25 +984,28 @@ class ttReportHelper {
               if ($bean->getAttribute('chstart')) $body .= '<td></td>';
               if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
               if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
               if ($bean->getAttribute('chstart')) $body .= '<td></td>';
               if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
               if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';

+              if ($bean->getAttribute('chunits')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['units'].'</td>';

               if ($bean->getAttribute('chnote')) $body .= '<td></td>';
               if ($bean->getAttribute('chcost')) {
               if ($bean->getAttribute('chnote')) $body .= '<td></td>';
               if ($bean->getAttribute('chcost')) {

-               $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-               $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
-               $body .= '</td>';
+                $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
+                $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
+                $body .= '</td>';

               }
               }

+              if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
+              if ($bean->getAttribute('chip')) $body .= '<td></td>';

               if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
               $body .= '</tr>';
               $body .= '<tr><td>&nbsp;</td></tr>';
             }
             $first_pass = false;
           }
               if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
               $body .= '</tr>';
               $body .= '<tr><td>&nbsp;</td></tr>';
             }
             $first_pass = false;
           }

-          
+

           // Print a regular row.
           if ($cur_date != $prev_date)
             $row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem;
           $body .= '<tr style="'.$row_style.'">';
           $body .= '<td style="'.$cellLeftAligned.'">'.$record['date'].'</td>';
           // Print a regular row.
           if ($cur_date != $prev_date)
             $row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem;
           $body .= '<tr style="'.$row_style.'">';
           $body .= '<td style="'.$cellLeftAligned.'">'.$record['date'].'</td>';

-          if ($user->canManageTeam() || $user->isClient())
+          if ($canViewReports || $isClient)

             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['user']).'</td>';
           if ($bean->getAttribute('chclient'))
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['client']).'</td>';
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['user']).'</td>';
           if ($bean->getAttribute('chclient'))
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['client']).'</td>';


@@ -1239,26 +1021,38 @@ class ttReportHelper {
             $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['finish'].'</td>';
           if ($bean->getAttribute('chduration'))
             $body .= '<td style="'.$cellRightAligned.'">'.$record['duration'].'</td>';
             $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['finish'].'</td>';
           if ($bean->getAttribute('chduration'))
             $body .= '<td style="'.$cellRightAligned.'">'.$record['duration'].'</td>';

+          if ($bean->getAttribute('chunits'))
+            $body .= '<td style="'.$cellRightAligned.'">'.$record['units'].'</td>';

           if ($bean->getAttribute('chnote'))
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
           if ($bean->getAttribute('chcost'))
             $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
           if ($bean->getAttribute('chnote'))
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
           if ($bean->getAttribute('chcost'))
             $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';

+          if ($bean->getAttribute('chpaid')) {
+            $body .= '<td style="'.$cellRightAligned.'">';
+            $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+            $body .= '</td>';
+          }
+          if ($bean->getAttribute('chip')) {
+            $body .= '<td style="'.$cellRightAligned.'">';
+            $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created'];
+            $body .= '</td>';
+          }

           if ($bean->getAttribute('chinvoice'))
             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
           $body .= '</tr>';
           if ($bean->getAttribute('chinvoice'))
             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
           $body .= '</tr>';

-          
+

           $prev_date = $record['date'];
           if ($print_subtotals)
             $prev_grouped_by = $record['grouped_by'];
         }
       }
           $prev_date = $record['date'];
           if ($print_subtotals)
             $prev_grouped_by = $record['grouped_by'];
         }
       }

-      
+

       // Print a terminating subtotal.
       if ($print_subtotals) {
         $body .= '<tr style="'.$rowSubtotal.'">';
       // Print a terminating subtotal.
       if ($print_subtotals) {
         $body .= '<tr style="'.$rowSubtotal.'">';

-        $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+        $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';

         $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
         $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);

-        if ($user->canManageTeam() || $user->isClient()) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
+        if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';

         if ($bean->getAttribute('chclient')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
         if ($bean->getAttribute('chproject')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
         if ($bean->getAttribute('chtask')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
         if ($bean->getAttribute('chclient')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
         if ($bean->getAttribute('chproject')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
         if ($bean->getAttribute('chtask')) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';


@@ -1266,21 +1060,24 @@ class ttReportHelper {
         if ($bean->getAttribute('chstart')) $body .= '<td></td>';
         if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
         if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
         if ($bean->getAttribute('chstart')) $body .= '<td></td>';
         if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
         if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';

+        if ($bean->getAttribute('chunits')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['units'].'</td>';

         if ($bean->getAttribute('chnote')) $body .= '<td></td>';
         if ($bean->getAttribute('chcost')) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
         if ($bean->getAttribute('chnote')) $body .= '<td></td>';
         if ($bean->getAttribute('chcost')) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';

-          $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
+          $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];

           $body .= '</td>';
         }
           $body .= '</td>';
         }

+        if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
+        if ($bean->getAttribute('chip')) $body .= '<td></td>';

         if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
         $body .= '</tr>';
       }
         if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
         $body .= '</tr>';
       }

-      
+

       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';
       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';

-      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
-      if ($user->canManageTeam() || $user->isClient()) $body .= '<td></td>';
+      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
+      if ($canViewReports || $isClient) $body .= '<td></td>';

       if ($bean->getAttribute('chclient')) $body .= '<td></td>';
       if ($bean->getAttribute('chproject')) $body .= '<td></td>';
       if ($bean->getAttribute('chtask')) $body .= '<td></td>';
       if ($bean->getAttribute('chclient')) $body .= '<td></td>';
       if ($bean->getAttribute('chproject')) $body .= '<td></td>';
       if ($bean->getAttribute('chtask')) $body .= '<td></td>';


@@ -1288,149 +1085,189 @@ class ttReportHelper {
       if ($bean->getAttribute('chstart')) $body .= '<td></td>';
       if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
       if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
       if ($bean->getAttribute('chstart')) $body .= '<td></td>';
       if ($bean->getAttribute('chfinish')) $body .= '<td></td>';
       if ($bean->getAttribute('chduration')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';

+      if ($bean->getAttribute('chunits')) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['units'].'</td>';

       if ($bean->getAttribute('chnote')) $body .= '<td></td>';
       if ($bean->getAttribute('chcost')) {
       if ($bean->getAttribute('chnote')) $body .= '<td></td>';
       if ($bean->getAttribute('chcost')) {

-       $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
-       $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
-       $body .= '</td>';
+        $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
+        $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
+        $body .= '</td>';

       }
       }

+      if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
+      if ($bean->getAttribute('chip')) $body .= '<td></td>';

       if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
       $body .= '</tr>';
       if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
       $body .= '</tr>';

-      
+

       $body .= '</table>';
     }
       $body .= '</table>';
     }

-    
+

     // Output footer.
     // Output footer.

-    $body .= '<p style="text-align: center;">'.$i18n->getKey('form.mail.footer').'</p>';
+    if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false))
+      $body .= '<p style="text-align: center;">'.$i18n->get('form.mail.footer').'</p>';

 
     // Finish creating email body.
     $body .= '</body></html>';
 
     return $body;
   }
 
     // Finish creating email body.
     $body .= '</body></html>';
 
     return $body;
   }

-  
-// prepareFavReportBody - prepares an email body for a favorite report.
-  static function prepareFavReportBody($report)
+
+  // checkFavReportCondition - checks whether it is okay to send fav report.
+  static function checkFavReportCondition($options, $condition)

   {
   {

-       global $user;
-       global $i18n;
-       
-       $items = ttReportHelper::getFavItems($report);
-    $group_by = $report['group_by'];
-       if ($group_by && 'no_grouping' != $group_by)
-        $subtotals = ttReportHelper::getFavSubtotals($report);    
-    $totals = ttReportHelper::getFavTotals($report);           
-       
+    $items = ttReportHelper::getItems($options);
+
+    $condition = str_replace('count', '', $condition);
+    $count_required = (int) trim(str_replace('>', '', $condition));
+
+    if (count($items) > $count_required)
+      return true; // Condition ok.
+
+    return false;
+  }
+
+  // prepareFavReportBody - prepares an email body for a favorite report.
+  static function prepareFavReportBody($options)
+  {
+    global $user;
+    global $i18n;
+
+    // Determine these once as they are used in multiple places in this function.
+    $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
+    $isClient = $user->isClient();
+
+    $items = ttReportHelper::getItems($options);
+    $group_by = $options['group_by'];
+    if ($group_by && 'no_grouping' != $group_by)
+      $subtotals = ttReportHelper::getFavSubtotals($options);
+    $totals = ttReportHelper::getTotals($options);
+

     // Use custom fields plugin if it is enabled.
     // Use custom fields plugin if it is enabled.

-    if (in_array('cf', explode(',', $user->plugins)))
-      $custom_fields = new CustomFields($user->team_id);
+    if ($user->isPluginEnabled('cf'))
+      $custom_fields = new CustomFields($user->group_id);

 
     // Define some styles to use in email.
     $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
     $tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
     $tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';
 
     // Define some styles to use in email.
     $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
     $tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
     $tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';

-    $rowItem = 'background-color: #ccccce;';
+    $rowItem = 'background-color: #ffffff;';

     $rowItemAlt = 'background-color: #f5f5f5;';
     $rowSubtotal = 'background-color: #e0e0e0;';
     $cellLeftAligned = 'text-align: left; vertical-align: top;';
     $cellRightAligned = 'text-align: right; vertical-align: top;';
     $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;';
     $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;';
     $rowItemAlt = 'background-color: #f5f5f5;';
     $rowSubtotal = 'background-color: #e0e0e0;';
     $cellLeftAligned = 'text-align: left; vertical-align: top;';
     $cellRightAligned = 'text-align: right; vertical-align: top;';
     $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;';
     $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;';

-    
+

     // Start creating email body.
     $body = '<html>';
     $body .= '<head><meta http-equiv="content-type" content="text/html; charset='.CHARSET.'"></head>';
     $body .= '<body>';
     // Start creating email body.
     $body = '<html>';
     $body .= '<head><meta http-equiv="content-type" content="text/html; charset='.CHARSET.'"></head>';
     $body .= '<body>';

-    
+

     // Output title.
     // Output title.

-    $body .= '<p style="'.$style_title.'">'.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';
+    $body .= '<p style="'.$style_title.'">'.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'</p>';

 
     // Output comment.
     // if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>'; // No comment for fav. reports.
 
 
     // Output comment.
     // if ($comment) $body .= '<p>'.htmlspecialchars($comment).'</p>'; // No comment for fav. reports.
 

-    if ($report['show_totals_only']) {
+    if ($options['show_totals_only']) {

       // Totals only report. Output subtotals.
       // Totals only report. Output subtotals.

-      
+

       // Determine group_by header.
       if ('cf_1' == $group_by)
         $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']);
       else {
         $key = 'label.'.$group_by;
       // Determine group_by header.
       if ('cf_1' == $group_by)
         $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']);
       else {
         $key = 'label.'.$group_by;

-        $group_by_header = $i18n->getKey($key);
+        $group_by_header = $i18n->get($key);

       }
       }

-       
+

       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
       $body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
       $body .= '<td style="'.$tableHeader.'">'.$group_by_header.'</td>';

-      if ($report['show_duration'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
-      if ($report['show_cost'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
+      if ($options['show_duration'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
+      if ($options['show_work_units'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
+      if ($options['show_cost'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';

       $body .= '</tr>';
       foreach($subtotals as $subtotal) {
         $body .= '<tr style="'.$rowSubtotal.'">';
         $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($subtotal['name'] ? htmlspecialchars($subtotal['name']) : '&nbsp;').'</td>';
       $body .= '</tr>';
       foreach($subtotals as $subtotal) {
         $body .= '<tr style="'.$rowSubtotal.'">';
         $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($subtotal['name'] ? htmlspecialchars($subtotal['name']) : '&nbsp;').'</td>';

-        if ($report['show_duration']) {
+        if ($options['show_duration']) {

           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           if ($subtotal['time'] <> '0:00') $body .= $subtotal['time'];
           $body .= '</td>';
         }
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           if ($subtotal['time'] <> '0:00') $body .= $subtotal['time'];
           $body .= '</td>';
         }

-        if ($report['show_cost']) {
+        if ($options['show_work_units']) {
+          $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
+          $body .= $subtotal['units'];
+          $body .= '</td>';
+        }
+        if ($options['show_cost']) {

           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';

-          $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses'];
+          $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];

           $body .= '</td>';
         }
         $body .= '</tr>';
       }
           $body .= '</td>';
         }
         $body .= '</tr>';
       }

-      
+

       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';
       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';

-      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
-      if ($report['show_duration']) {
-       $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-       if ($totals['time'] <> '0:00') $body .= $totals['time'];
-       $body .= '</td>';
+      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
+      if ($options['show_duration']) {
+        $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
+        if ($totals['time'] <> '0:00') $body .= $totals['time'];
+        $body .= '</td>';
+      }
+      if ($options['show_work_units']) {
+        $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
+        $body .= $totals['units'];
+        $body .= '</td>';

       }
       }

-      if ($report['show_cost']) {
-       $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
-        $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
-       $body .= '</td>';
+      if ($options['show_cost']) {
+        $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
+        $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
+        $body .= '</td>';

       }
       $body .= '</tr>';
       }
       $body .= '</tr>';

-       
+

       $body .= '</table>';
     } else {
       // Regular report.
       $body .= '</table>';
     } else {
       // Regular report.

-      
+

       // Print table header.
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
       // Print table header.
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';

-      $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.date').'</td>';
-      if ($user->canManageTeam() || $user->isClient())
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.user').'</td>';
-      if ($report['show_client'])
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.client').'</td>';
-      if ($report['show_project'])
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.project').'</td>';
-      if ($report['show_task'])
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.task').'</td>';
-      if ($report['show_custom_field_1'])
+      $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.date').'</td>';
+      if ($canViewReports || $isClient)
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.user').'</td>';
+      if ($options['show_client'])
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.client').'</td>';
+      if ($options['show_project'])
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.project').'</td>';
+      if ($options['show_task'])
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.task').'</td>';
+      if ($options['show_custom_field_1'])

         $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>';
         $body .= '<td style="'.$tableHeader.'">'.htmlspecialchars($custom_fields->fields[0]['label']).'</td>';

-      if ($report['show_start'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.start').'</td>';
-      if ($report['show_end'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.finish').'</td>';
-      if ($report['show_duration'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.duration').'</td>';
-      if ($report['show_note'])
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.note').'</td>';
-      if ($report['show_cost'])
-        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
-      if ($report['show_invoice'])
-        $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.invoice').'</td>';
+      if ($options['show_start'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.start').'</td>';
+      if ($options['show_end'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.finish').'</td>';
+      if ($options['show_duration'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
+      if ($options['show_work_units'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
+      if ($options['show_note'])
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
+      if ($options['show_cost'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
+      if ($options['show_paid'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.paid').'</td>';
+      if ($options['show_ip'])
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.ip').'</td>';
+      if ($options['show_invoice'])
+        $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.invoice').'</td>';

       $body .= '</tr>';
       $body .= '</tr>';

-      
+

       // Initialize variables to print subtotals.
       if ($items && 'no_grouping' != $group_by) {
         $print_subtotals = true;
       // Initialize variables to print subtotals.
       if ($items && 'no_grouping' != $group_by) {
         $print_subtotals = true;


@@ -1442,7 +1279,7 @@ class ttReportHelper {
       $prev_date = '';
       $cur_date = '';
       $row_style = $rowItem;
       $prev_date = '';
       $cur_date = '';
       $row_style = $rowItem;

-      
+

       // Print report items.
       if (is_array($items)) {
         foreach ($items as $record) {
       // Print report items.
       if (is_array($items)) {
         foreach ($items as $record) {


@@ -1452,141 +1289,233 @@ class ttReportHelper {
             $cur_grouped_by = $record['grouped_by'];
             if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
               $body .= '<tr style="'.$rowSubtotal.'">';
             $cur_grouped_by = $record['grouped_by'];
             if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
               $body .= '<tr style="'.$rowSubtotal.'">';

-              $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+              $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';

               $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
               $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);

-              if ($user->canManageTeam() || $user->isClient()) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
-              if ($report['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
-              if ($report['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
-              if ($report['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
-              if ($report['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
-              if ($report['show_start']) $body .= '<td></td>';
-              if ($report['show_end']) $body .= '<td></td>';
-              if ($report['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
-              if ($report['show_note']) $body .= '<td></td>';
-              if ($report['show_cost']) {
+              if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
+              if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
+              if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
+              if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
+              if ($options['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
+              if ($options['show_start']) $body .= '<td></td>';
+              if ($options['show_end']) $body .= '<td></td>';
+              if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
+              if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['units'].'</td>';
+              if ($options['show_note']) $body .= '<td></td>';
+              if ($options['show_cost']) {

                 $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
                 $body .= '<td style="'.$cellRightAlignedSubtotal.'">';

-                $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
+                $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];

                 $body .= '</td>';
               }
                 $body .= '</td>';
               }

-              if ($report['show_invoice']) $body .= '<td></td>';
+              if ($options['show_paid']) $body .= '<td></td>';
+              if ($options['show_ip']) $body .= '<td></td>';
+              if ($options['show_invoice']) $body .= '<td></td>';

               $body .= '</tr>';
               $body .= '</tr>';

-              $body .= '<tr><td>&nbsp;</td></tr>';     
+              $body .= '<tr><td>&nbsp;</td></tr>';

             }
             $first_pass = false;
             }
             $first_pass = false;

-         }
-       
+          }
+

           // Print a regular row.
           if ($cur_date != $prev_date)
             $row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem;
           $body .= '<tr style="'.$row_style.'">';
           $body .= '<td style="'.$cellLeftAligned.'">'.$record['date'].'</td>';
           // Print a regular row.
           if ($cur_date != $prev_date)
             $row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem;
           $body .= '<tr style="'.$row_style.'">';
           $body .= '<td style="'.$cellLeftAligned.'">'.$record['date'].'</td>';

-          if ($user->canManageTeam() || $user->isClient())
+          if ($canViewReports || $isClient)

             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['user']).'</td>';
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['user']).'</td>';

-          if ($report['show_client'])
+          if ($options['show_client'])

             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['client']).'</td>';
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['client']).'</td>';

-          if ($report['show_project'])
+          if ($options['show_project'])

             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['project']).'</td>';
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['project']).'</td>';

-          if ($report['show_task'])
+          if ($options['show_task'])

             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['task']).'</td>';
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['task']).'</td>';

-          if ($report['show_custom_field_1'])
+          if ($options['show_custom_field_1'])

             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['cf_1']).'</td>';
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['cf_1']).'</td>';

-          if ($report['show_start'])
+          if ($options['show_start'])

             $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['start'].'</td>';
             $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['start'].'</td>';

-          if ($report['show_end'])
+          if ($options['show_end'])

             $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['finish'].'</td>';
             $body .= '<td nowrap style="'.$cellRightAligned.'">'.$record['finish'].'</td>';

-          if ($report['show_duration'])
+          if ($options['show_duration'])

             $body .= '<td style="'.$cellRightAligned.'">'.$record['duration'].'</td>';
             $body .= '<td style="'.$cellRightAligned.'">'.$record['duration'].'</td>';

-          if ($report['show_note'])
+          if ($options['show_work_units'])
+            $body .= '<td style="'.$cellRightAligned.'">'.$record['units'].'</td>';
+          if ($options['show_note'])

             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';

-          if ($report['show_cost'])
+          if ($options['show_cost'])

             $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
             $body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';

-          if ($report['show_invoice'])
+          if ($options['show_paid']) {
+            $body .= '<td style="'.$cellRightAligned.'">';
+            $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+            $body .= '</td>';
+          }
+          if ($options['show_ip']) {
+            $body .= '<td style="'.$cellRightAligned.'">';
+            $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created'];
+            $body .= '</td>';
+          }
+          if ($options['show_invoice'])

             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
           $body .= '</tr>';
             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
           $body .= '</tr>';

-            
+

           $prev_date = $record['date'];
           if ($print_subtotals)
             $prev_grouped_by = $record['grouped_by'];
         }
       }
           $prev_date = $record['date'];
           if ($print_subtotals)
             $prev_grouped_by = $record['grouped_by'];
         }
       }

-      
+

       // Print a terminating subtotal.
       if ($print_subtotals) {
         $body .= '<tr style="'.$rowSubtotal.'">';
       // Print a terminating subtotal.
       if ($print_subtotals) {
         $body .= '<tr style="'.$rowSubtotal.'">';

-        $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
+        $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.subtotal').'</td>';

         $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
         $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);

-        if ($user->canManageTeam() || $user->isClient()) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
-        if ($report['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
-        if ($report['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
-        if ($report['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
-        if ($report['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
-        if ($report['show_start']) $body .= '<td></td>';
-        if ($report['show_end']) $body .= '<td></td>';
-        if ($report['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
-        if ($report['show_note']) $body .= '<td></td>';
-        if ($report['show_cost']) {
+        if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
+        if ($options['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
+        if ($options['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
+        if ($options['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
+        if ($options['show_custom_field_1']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'cf_1' ? $subtotal_name : '').'</td>';
+        if ($options['show_start']) $body .= '<td></td>';
+        if ($options['show_end']) $body .= '<td></td>';
+        if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
+        if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['units'].'</td>';
+        if ($options['show_note']) $body .= '<td></td>';
+        if ($options['show_cost']) {

           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';

-          $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
+          $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];

           $body .= '</td>';
         }
           $body .= '</td>';
         }

-        if ($report['show_invoice']) $body .= '<td></td>';
+        if ($options['show_paid']) $body .= '<td></td>';
+        if ($options['show_ip']) $body .= '<td></td>';
+        if ($options['show_invoice']) $body .= '<td></td>';

         $body .= '</tr>';
       }
         $body .= '</tr>';
       }

-      
+

       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';
       // Print totals.
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';

-      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
-      if ($user->canManageTeam() || $user->isClient()) $body .= '<td></td>';
-      if ($report['show_client']) $body .= '<td></td>';
-      if ($report['show_project']) $body .= '<td></td>';
-      if ($report['show_task']) $body .= '<td></td>';
-      if ($report['show_custom_field_1']) $body .= '<td></td>';
-      if ($report['show_start']) $body .= '<td></td>';
-      if ($report['show_end']) $body .= '<td></td>';
-      if ($report['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
-      if ($report['show_note']) $body .= '<td></td>';
-      if ($report['show_cost']) {
-       $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
-       $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
-       $body .= '</td>';
+      $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->get('label.total').'</td>';
+      if ($canViewReports || $isClient) $body .= '<td></td>';
+      if ($options['show_client']) $body .= '<td></td>';
+      if ($options['show_project']) $body .= '<td></td>';
+      if ($options['show_task']) $body .= '<td></td>';
+      if ($options['show_custom_field_1']) $body .= '<td></td>';
+      if ($options['show_start']) $body .= '<td></td>';
+      if ($options['show_end']) $body .= '<td></td>';
+      if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
+      if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['units'].'</td>';
+      if ($options['show_note']) $body .= '<td></td>';
+      if ($options['show_cost']) {
+        $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
+        $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
+        $body .= '</td>';

       }
       }

-      if ($report['show_invoice']) $body .= '<td></td>';
+      if ($options['show_paid']) $body .= '<td></td>';
+      if ($options['show_ip']) $body .= '<td></td>';
+      if ($options['show_invoice']) $body .= '<td></td>';

       $body .= '</tr>';
       $body .= '</tr>';

-      
+

       $body .= '</table>';
     }
       $body .= '</table>';
     }

-    
+

     // Output footer.
     // Output footer.

-    $body .= '<p style="text-align: center;">'.$i18n->getKey('form.mail.footer').'</p>';
+    if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false))
+      $body .= '<p style="text-align: center;">'.$i18n->get('form.mail.footer').'</p>';

 
     // Finish creating email body.
     $body .= '</body></html>';
 
     return $body;
   }
 
     // Finish creating email body.
     $body .= '</body></html>';
 
     return $body;
   }

-  
+

   // sendFavReport - sends a favorite report to a specified email, called from cron.php
   // sendFavReport - sends a favorite report to a specified email, called from cron.php

-  static function sendFavReport($report, $email) {
+  static function sendFavReport($options, $subject, $email, $cc) {

     // We are called from cron.php, we have no $bean in session.
     // We are called from cron.php, we have no $bean in session.

-    // cron.php set global $user and $i18n objects to match our favorite report user.
+    // cron.php sets global $user and $i18n objects to match our favorite report user.

     global $user;
     global $i18n;
     global $user;
     global $i18n;

-    
+

     // Prepare report body.
     // Prepare report body.

-    $body = ttReportHelper::prepareFavReportBody($report);
-                       
+    $body = ttReportHelper::prepareFavReportBody($options);
+

     import('mail.Mailer');
     $mailer = new Mailer();
     $mailer->setCharSet(CHARSET);
     $mailer->setContentType('text/html');
     $mailer->setSender(SENDER);
     import('mail.Mailer');
     $mailer = new Mailer();
     $mailer->setCharSet(CHARSET);
     $mailer->setContentType('text/html');
     $mailer->setSender(SENDER);

+    if (!empty($cc))
+      $mailer->setReceiverCC($cc);
+    if (!empty($user->bcc_email))
+      $mailer->setReceiverBCC($user->bcc_email);

     $mailer->setReceiver($email);
     $mailer->setReceiver($email);

-    $mailer->setSendType(MAIL_MODE);
-    if (!$mailer->send($report['name'], $body))
+    $mailer->setMailMode(MAIL_MODE);
+    if (empty($subject)) $subject = $options['name'];
+    if (!$mailer->send($subject, $body))

       return false;
       return false;

-      
+
+    return true;
+  }
+
+  // getReportOptions - returns an array of report options constructed from session bean.
+  //
+  // Note: similarly to ttFavReportHelper::getReportOptions, this function is a part of
+  // refactoring to simplify maintenance of report generating functions, as we currently
+  // have 2 sets: normal reporting (from bean), and fav report emailing (from db fields).
+  // Using options obtained from either db or bean shall allow us to use only one set of functions.
+  static function getReportOptions($bean) {
+    global $user;
+
+    // Prepare an array of report options.
+    $options = array();
+
+    // Construct one by one.
+    $options['name'] = null; // No name required.
+    $options['user_id'] = $user->id; // Not sure if we need user_id here. Fav reports use it to recycle $user object in cron.php.
+    $options['client_id'] = $bean->getAttribute('client');
+    $options['cf_1_option_id'] = $bean->getAttribute('option');
+    $options['project_id'] = $bean->getAttribute('project');
+    $options['task_id'] = $bean->getAttribute('task');
+    $options['billable'] = $bean->getAttribute('include_records');
+    $options['invoice'] = $bean->getAttribute('invoice');
+    $options['paid_status'] = $bean->getAttribute('paid_status');
+    if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users'));
+    $options['period'] = $bean->getAttribute('period');
+    $options['period_start'] = $bean->getAttribute('start_date');
+    $options['period_end'] = $bean->getAttribute('end_date');
+    $options['show_client'] = $bean->getAttribute('chclient');
+    $options['show_invoice'] = $bean->getAttribute('chinvoice');
+    $options['show_paid'] = $bean->getAttribute('chpaid');
+    $options['show_ip'] = $bean->getAttribute('chip');
+    $options['show_project'] = $bean->getAttribute('chproject');
+    $options['show_start'] = $bean->getAttribute('chstart');
+    $options['show_duration'] = $bean->getAttribute('chduration');
+    $options['show_cost'] = $bean->getAttribute('chcost');
+    $options['show_task'] = $bean->getAttribute('chtask');
+    $options['show_end'] = $bean->getAttribute('chfinish');
+    $options['show_note'] = $bean->getAttribute('chnote');
+    $options['show_custom_field_1'] = $bean->getAttribute('chcf_1');
+    $options['show_work_units'] = $bean->getAttribute('chunits');
+    $options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
+    $options['group_by'] = $bean->getAttribute('group_by');
+    return $options;
+  }
+
+  // verifyBean is a security function to make sure data in bean makes sense for a group.
+  static function verifyBean($bean) {
+    global $user;
+
+    // Check users.
+    $users_in_bean = $bean->getAttribute('users');
+    if (is_array($users_in_bean)) {
+      $users_in_group = ttTeamHelper::getUsers();
+      foreach ($users_in_group as $user_in_group) {
+        $valid_ids[] = $user_in_group['id'];
+      }
+      foreach ($users_in_bean as $user_in_bean) {
+        if (!in_array($user_in_bean, $valid_ids)) {
+          return false;
+        }
+      }
+    }
+
+    // TODO: add additional checks here. Perhaps do it before saving the bean for consistency.

     return true;
   }
 }
     return true;
   }
 }

-?>
\ No newline at end of file