{if $bean->getAttribute('chfinish')}<td class="tableHeaderCentered" width="5%">{$i18n.label.finish}</td>{/if}
{if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
{if $bean->getAttribute('chunits')}<td class="tableHeaderCentered" width="5%">{$i18n.label.work_units_short}</td>{/if}
- {if $bean->getAttribute('chnote')}<td class="tableHeader">{$i18n.label.note}</td>{/if}
+ {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="tableHeader">{$i18n.label.note}</td>{/if}
{if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
{if $bean->getAttribute('chapproved')}<td class="tableHeader">{$i18n.label.approved}</td>{/if}
{if $bean->getAttribute('chpaid')}<td class="tableHeader">{$i18n.label.paid}</td>{/if}
{if $bean->getAttribute('chip')}<td class="tableHeaderCentered">{$i18n.label.ip}</td>{/if}
{if $bean->getAttribute('chinvoice')}<td class="tableHeader">{$i18n.label.invoice}</td>{/if}
{if $bean->getAttribute('chtimesheet')}<td class="tableHeader">{$i18n.label.timesheet}</td>{/if}
+ {if $bean->getAttribute('chfiles')}<td></td>{/if}
</tr>
{foreach $report_items as $item}
<!-- print subtotal for a block of grouped values -->
{if $bean->getAttribute('chfinish')}<td></td>{/if}
{if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
{if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['units']}</td>{/if}
- {if $bean->getAttribute('chnote')}<td></td>{/if}
+ {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
{if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
{if $bean->getAttribute('chapproved')}<td></td>{/if}
{if $bean->getAttribute('chpaid')}<td></td>{/if}
{if $bean->getAttribute('chip')}<td></td>{/if}
{if $bean->getAttribute('chinvoice')}<td></td>{/if}
{if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+ {if $bean->getAttribute('chfiles')}<td></td>{/if}
{if $use_checkboxes}<td></td>{/if}
</tr>
<tr><td> </td></tr>
{if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
{if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
{if $bean->getAttribute('chunits')}<td class="cellRightAligned">{$item.units}</td>{/if}
- {if $bean->getAttribute('chnote')}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
+ {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
{if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
- {if $bean->getAttribute('chapproved')}<td class="cellRightAligned">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
- {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
- {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}{/if}
+ {if $bean->getAttribute('chapproved')}<td class="cellRightAligned">{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
+ {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>{/if}
+ {if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}</td>{/if}
{if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
{if $bean->getAttribute('chtimesheet')}<td class="cellRightAligned">{$item.timesheet_name|escape}</td>{/if}
+ {if $bean->getAttribute('chfiles')}<td class="cellRightAligned">{if $item.has_files}<a href="time_files.php?id={$item.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a>{/if}</td>{/if}
{if $use_checkboxes}
{if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
{if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
{/if}
</tr>
+ {if $note_on_separate_row && $bean->getAttribute('chnote') && $item.note}
+ <tr>
+ <td class="cellRightAligned">{$i18n.label.note}:</td>
+ <td colspan="{$colspan}">{$item.note|escape}</td>
+ </tr>
+ {/if}
{$prev_date = $item.date}
{if $print_subtotals} {$prev_grouped_by = $item.grouped_by} {/if}
{/foreach}
{if $bean->getAttribute('chfinish')}<td></td>{/if}
{if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
{if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['units']}</td>{/if}
- {if $bean->getAttribute('chnote')}<td></td>{/if}
+ {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
{if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
{if $bean->getAttribute('chapproved')}<td></td>{/if}
{if $bean->getAttribute('chpaid')}<td></td>{/if}
{if $bean->getAttribute('chip')}<td></td>{/if}
{if $bean->getAttribute('chinvoice')}<td></td>{/if}
{if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+ {if $bean->getAttribute('chfiles')}<td></td>{/if}
{if $use_checkboxes}<td></td>{/if}
</tr>
{/if}
{if $bean->getAttribute('chfinish')}<td></td>{/if}
{if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
{if $bean->getAttribute('chunits')}<td class="cellRightAlignedSubtotal">{$totals['units']}</td>{/if}
- {if $bean->getAttribute('chnote')}<td></td>{/if}
+ {if $bean->getAttribute('chnote') && !$note_on_separate_row}<td></td>{/if}
{if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
{if $bean->getAttribute('chapproved')}<td></td>{/if}
{if $bean->getAttribute('chpaid')}<td></td>{/if}
{if $bean->getAttribute('chip')}<td></td>{/if}
{if $bean->getAttribute('chinvoice')}<td></td>{/if}
{if $bean->getAttribute('chtimesheet')}<td></td>{/if}
+ {if $bean->getAttribute('chfiles')}<td></td>{/if}
{if $use_checkboxes}<td></td>{/if}
</tr>
{/if}
</td>
</tr>
</table>
-{if $report_items && ($use_mark_approved || $use_mark_paid || $use_assign_to_invoice)}
+{if $report_items && ($use_mark_approved || $use_mark_paid || $use_assign_to_invoice || $use_assign_to_timesheet)}
<table width="720" cellspacing="0" cellpadding="0" border="0">
{if $use_mark_approved}
<tr>
<tr>
<td align="right">
<table>
- <tr><td>{$i18n.form.report.assign_to_invoice}: {$forms.reportViewForm.assign_invoice_select_options.control} {$forms.reportViewForm.recent_invoice.control} {$forms.reportViewForm.btn_assign.control}</td></tr>
+ <tr><td>{$i18n.form.report.assign_to_invoice}: {$forms.reportViewForm.assign_invoice_select_options.control} {$forms.reportViewForm.recent_invoice.control} {$forms.reportViewForm.btn_assign_invoice.control}</td></tr>
+ </table>
+ </td>
+ </tr>
+ {/if}
+ {if $use_assign_to_timesheet}
+ <tr>
+ <td align="right">
+ <table>
+ <tr><td>{$i18n.form.report.assign_to_timesheet}: {$forms.reportViewForm.assign_timesheet_select_options.control} {$forms.reportViewForm.timesheet.control} {$forms.reportViewForm.btn_assign_timesheet.control}</td></tr>
</table>
</td>
</tr>
<table>
<tr>
<td><input type="button" onclick="chLocation('report_send.php');" value="{$i18n.button.send_by_email}"></td>
-{if $can_create_timesheet}
- <td><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.create_timesheet}"></td>
-{/if}
</tr>
</table>
</td>