';
$html .= "";
$html .= ''.$i18n->get('label.date').' | ';
- if ($user->canManageTeam() || $user->isClient()) { $colspan++; $html .= ''.$i18n->get('label.user').' | '; }
+ if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) { $colspan++; $html .= ''.$i18n->get('label.user').' | '; }
if ($bean->getAttribute('chclient')) { $colspan++; $html .= ''.$i18n->get('label.client').' | '; }
if ($bean->getAttribute('chproject')) { $colspan++; $html .= ''.$i18n->get('label.project').' | '; }
if ($bean->getAttribute('chtask')) { $colspan++; $html .= ''.$i18n->get('label.task').' | '; }
@@ -158,6 +162,7 @@ if ($totals_only) {
if ($bean->getAttribute('chstart')) { $colspan++; $html .= "".$i18n->get('label.start').' | '; }
if ($bean->getAttribute('chfinish')) { $colspan++; $html .= "".$i18n->get('label.finish').' | '; }
if ($bean->getAttribute('chduration')) { $colspan++; $html .= "".$i18n->get('label.duration').' | '; }
+ if ($bean->getAttribute('chunits')) { $colspan++; $html .= "".$i18n->get('label.work_units_short').' | '; }
if ($bean->getAttribute('chnote')) { $colspan++; $html .= ''.$i18n->get('label.note').' | '; }
if ($bean->getAttribute('chcost')) { $colspan++; $html .= "".$i18n->get('label.cost').' | '; }
if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "".$i18n->get('label.paid').' | '; }
@@ -174,7 +179,7 @@ if ($totals_only) {
if ($cur_grouped_by != $prev_grouped_by && !$first_pass) {
$html .= '
';
$html .= ''.$i18n->get('label.subtotal').' | ';
- if ($user->canManageTeam() || $user->isClient()) {
+ if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
$html .= '';
if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
$html .= ' | ';
@@ -202,10 +207,11 @@ if ($totals_only) {
if ($bean->getAttribute('chstart')) $html .= ' | ';
if ($bean->getAttribute('chfinish')) $html .= ' | ';
if ($bean->getAttribute('chduration')) $html .= "".$subtotals[$prev_grouped_by]['time'].' | ';
+ if ($bean->getAttribute('chunits')) $html .= "".$subtotals[$prev_grouped_by]['units'].' | ';
if ($bean->getAttribute('chnote')) $html .= ' | ';
if ($bean->getAttribute('chcost')) {
$html .= "";
- if ($user->canManageTeam() || $user->isClient())
+ if ($user->can('manage_invoices') || $user->isClient())
$html .= $subtotals[$prev_grouped_by]['cost'];
else
$html .= $subtotals[$prev_grouped_by]['expenses'];
@@ -223,7 +229,7 @@ if ($totals_only) {
// Print a regular row.
$html .= ' |
';
$html .= ''.$item['date'].' | ';
- if ($user->canManageTeam() || $user->isClient()) $html .= ''.htmlspecialchars($item['user']).' | ';
+ if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $html .= ''.htmlspecialchars($item['user']).' | ';
if ($bean->getAttribute('chclient')) $html .= ''.htmlspecialchars($item['client']).' | ';
if ($bean->getAttribute('chproject')) $html .= ''.htmlspecialchars($item['project']).' | ';
if ($bean->getAttribute('chtask')) $html .= ''.htmlspecialchars($item['task']).' | ';
@@ -231,10 +237,11 @@ if ($totals_only) {
if ($bean->getAttribute('chstart')) $html .= "".$item['start'].' | ';
if ($bean->getAttribute('chfinish')) $html .= "".$item['finish'].' | ';
if ($bean->getAttribute('chduration')) $html .= "".$item['duration'].' | ';
+ if ($bean->getAttribute('chunits')) $html .= "".$item['units'].' | ';
if ($bean->getAttribute('chnote')) $html .= ''.htmlspecialchars($item['note']).' | ';
if ($bean->getAttribute('chcost')) {
$html .= "";
- if ($user->canManageTeam() || $user->isClient())
+ if ($user->can('manage_invoices') || $user->isClient())
$html .= $item['cost'];
else
$html .= $item['expense'];
@@ -261,7 +268,7 @@ if ($totals_only) {
if ($print_subtotals) {
$html .= ' |
';
$html .= ''.$i18n->get('label.subtotal').' | ';
- if ($user->canManageTeam() || $user->isClient()) {
+ if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
$html .= '';
if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
$html .= ' | ';
@@ -289,10 +296,11 @@ if ($totals_only) {
if ($bean->getAttribute('chstart')) $html .= ' | ';
if ($bean->getAttribute('chfinish')) $html .= ' | ';
if ($bean->getAttribute('chduration')) $html .= "".$subtotals[$prev_grouped_by]['time'].' | ';
+ if ($bean->getAttribute('chunits')) $html .= "".$subtotals[$prev_grouped_by]['units'].' | ';
if ($bean->getAttribute('chnote')) $html .= ' | ';
if ($bean->getAttribute('chcost')) {
$html .= "";
- if ($user->canManageTeam() || $user->isClient())
+ if ($user->can('manage_invoices') || $user->isClient())
$html .= $subtotals[$prev_grouped_by]['cost'];
else
$html .= $subtotals[$prev_grouped_by]['expenses'];
@@ -308,7 +316,7 @@ if ($totals_only) {
$html .= ' |
|
';
$html .= '';
$html .= ''.$i18n->get('label.total').' | ';
- if ($user->canManageTeam() || $user->isClient()) $html .= ' | ';
+ if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $html .= ' | ';
if ($bean->getAttribute('chclient')) $html .= ' | ';
if ($bean->getAttribute('chproject')) $html .= ' | ';
if ($bean->getAttribute('chtask')) $html .= ' | ';
@@ -316,10 +324,11 @@ if ($totals_only) {
if ($bean->getAttribute('chstart')) $html .= ' | ';
if ($bean->getAttribute('chfinish')) $html .= ' | ';
if ($bean->getAttribute('chduration')) $html .= "".$totals['time'].' | ';
+ if ($bean->getAttribute('chunits')) $html .= "".$totals['units'].' | ';
if ($bean->getAttribute('chnote')) $html .= ' | ';
if ($bean->getAttribute('chcost')) {
$html .= "".htmlspecialchars($user->currency).' ';
- if ($user->canManageTeam() || $user->isClient())
+ if ($user->can('manage_invoices') || $user->isClient())
$html .= $totals['cost'];
else
$html .= $totals['expenses'];
@@ -391,8 +400,8 @@ class ttPDF extends TCPDF {
$pdf = new ttPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
// If custom logo file exists - set it.
-if (file_exists('images/'.$user->team_id.'.png'))
- $pdf->SetImageFile('images/'.$user->team_id.'.png');
+if (file_exists('images/'.$user->group_id.'.png'))
+ $pdf->SetImageFile('images/'.$user->group_id.'.png');
// Set page word for the footer.
$pdf->SetPageWord($i18n->get('label.page'));
|