if ($bean->getAttribute('chfinish')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.finish').'</td>'; }
if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.duration').'</td>'; }
if ($bean->getAttribute('chunits')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.work_units_short').'</td>'; }
- if ($bean->getAttribute('chnote')) { $colspan++; $html .= '<td>'.$i18n->get('label.note').'</td>'; }
if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
+ if ($bean->getAttribute('chapproved')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.approved').'</td>'; }
if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.paid').'</td>'; }
if ($bean->getAttribute('chip')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.ip').'</td>'; }
if ($bean->getAttribute('chinvoice')) { $colspan++; $html .= '<td>'.$i18n->get('label.invoice').'</td>'; }
if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
- if ($bean->getAttribute('chnote')) $html .= '<td></td>';
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>";
if ($user->can('manage_invoices') || $user->isClient())
$html .= $subtotals[$prev_grouped_by]['expenses'];
$html .= '</td>';
}
+ if ($bean->getAttribute('chapproved')) $html .= '<td></td>';
if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
if ($bean->getAttribute('chip')) $html .= '<td></td>';
if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';
if ($bean->getAttribute('chtimesheet')) $html .= '<td></td>';
$html .= '</tr>';
$html .= '<tr><td colspan="'.$colspan.'"> </td></tr>';
+ // TODO: page breaks on PDF reports is a rarely used feature.
+ // Currently without configuration capability.
+ // Consider adding an option to user profile instead.
+ if (isTrue('PDF_REPORT_PAGE_BREAKS')) {
+ import('ttUserConfig');
+ $uc = new ttUserConfig();
+ $use_breaks = $uc->getValue(SYSC_PDF_REPORT_PAGE_BREAKS);
+ if ($use_breaks) $html .= '<br pagebreak="true"/>';
+ }
}
- $first_pass = false;
+ $first_pass = false;
}
// Print a regular row.
if ($bean->getAttribute('chfinish')) $html .= "<td $styleRightAligned>".$item['finish'].'</td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$item['duration'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$item['units'].'</td>';
- if ($bean->getAttribute('chnote')) $html .= '<td>'.htmlspecialchars($item['note']).'</td>';
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>";
if ($user->can('manage_invoices') || $user->isClient())
$html .= $item['expense'];
$html .= '</td>';
}
+ if ($bean->getAttribute('chapproved')) {
+ $html .= '<td>';
+ $html .= $item['approved'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+ $html .= '</td>';
+ }
if ($bean->getAttribute('chpaid')) {
$html .= '<td>';
$html .= $item['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
if ($bean->getAttribute('chtimesheet')) $html .= '<td>'.htmlspecialchars($item['timesheet_name']).'</td>';
$html .= '</tr>';
+ if ($bean->getAttribute('chnote') && $item['note']) {
+ $html .= '<tr>';
+ $html .= "<td $styleRightAligned>".$i18n->get('label.note').'</td>';
+ $noteSpan = $colspan-1;
+ $html .= '<td colspan="'.$noteSpan.'">'.htmlspecialchars($item['note']).'</td>';
+ $html .= '</tr>';
+ }
+
$prev_date = $item['date'];
if ($print_subtotals) $prev_grouped_by = $item['grouped_by'];
}
if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
- if ($bean->getAttribute('chnote')) $html .= '<td></td>';
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>";
if ($user->can('manage_invoices') || $user->isClient())
$html .= $subtotals[$prev_grouped_by]['expenses'];
$html .= '</td>';
}
+ if ($bean->getAttribute('chapproved')) $html .= '<td></td>';
if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
if ($bean->getAttribute('chip')) $html .= '<td></td>';
if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';
if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$totals['time'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$totals['units'].'</td>';
- if ($bean->getAttribute('chnote')) $html .= '<td></td>';
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>".htmlspecialchars($user->currency).' ';
if ($user->can('manage_invoices') || $user->isClient())
$html .= $totals['expenses'];
$html .= '</td>';
}
+ if ($bean->getAttribute('chapproved')) $html .= '<td></td>';
if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
if ($bean->getAttribute('chip')) $html .= '<td></td>';
if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';