ravithb
diff --git a/‎WEB-INF/lib/ttReportHelper.class.php‎
Lines changed: 18 additions & 0 deletions b/‎WEB-INF/lib/ttReportHelper.class.php‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎WEB-INF/templates/footer.tpl‎
Lines changed: 1 addition & 1 deletion b/‎WEB-INF/templates/footer.tpl‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎report.php‎
Lines changed: 1 addition & 1 deletion b/‎report.php‎
Lines changed: 1 addition & 1 deletion
@@ -738,6 +738,24 @@ static function prepareReportBody($options, $comment = null)
     $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;';
     $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;';
 
+    // Determine column span for note field.
+    $colspan = 1;
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;
+    if ($options['show_client']) $colspan++;
+    if ($options['show_project']) $colspan++;
+    if ($options['show_task']) $colspan++;
+    if ($options['show_custom_field_1']) $colspan++;
+    if ($options['show_start']) $colspan++;
+    if ($options['show_end']) $colspan++;
+    if ($options['show_duration']) $colspan++;
+    if ($options['show_work_units']) $colspan++;
+    if ($options['show_cost']) $colspan++;
+    if ($options['show_approved']) $colspan++;
+    if ($options['show_paid']) $colspan++;
+    if ($options['show_ip']) $colspan++;
+    if ($options['show_invoice']) $colspan++;
+    if ($options['show_timesheet']) $colspan++;
+
     // Start creating email body.
     $body = '<html>';
     $body .= '<head><meta http-equiv="content-type" content="text/html; charset='.CHARSET.'"></head>';
 
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.57.4857 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.57.4858 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
 
@@ -284,7 +284,7 @@
 
 // Determine column span for note field.
 $colspan = 1;
-if ($bean->getAttribute('chuser')) $colspan++;
+if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;
 if ($bean->getAttribute('chclient')) $colspan++;
 if ($bean->getAttribute('chproject')) $colspan++;
 if ($bean->getAttribute('chtask')) $colspan++;