@@ -48,11 +48,13 @@
{if $bean->getAttribute('chfinish')}{/if}
{if $bean->getAttribute('chduration')}{/if}
{if $bean->getAttribute('chunits')}{/if}
- {if $bean->getAttribute('chnote')}{/if}
{if $bean->getAttribute('chcost')}{/if}
+ {if $bean->getAttribute('chapproved')}{/if}
{if $bean->getAttribute('chpaid')}{/if}
{if $bean->getAttribute('chip')}{/if}
{if $bean->getAttribute('chinvoice')}{/if}
+ {if $bean->getAttribute('chtimesheet')}{/if}
+ {if $bean->getAttribute('chfiles')} | {/if}
{foreach $report_items as $item}
@@ -71,11 +73,13 @@
{if $bean->getAttribute('chfinish')} | {/if}
{if $bean->getAttribute('chduration')}{$subtotals[$prev_grouped_by]['time']} | {/if}
{if $bean->getAttribute('chunits')}{$subtotals[$prev_grouped_by]['units']} | {/if}
- {if $bean->getAttribute('chnote')} | {/if}
{if $bean->getAttribute('chcost')}{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chapproved')} | {/if}
{if $bean->getAttribute('chpaid')} | {/if}
{if $bean->getAttribute('chip')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
+ {if $bean->getAttribute('chtimesheet')} | {/if}
+ {if $bean->getAttribute('chfiles')} | {/if}
{if $use_checkboxes} | {/if}
|
@@ -97,16 +101,24 @@
{if $bean->getAttribute('chfinish')}{$item.finish} | {/if}
{if $bean->getAttribute('chduration')}{$item.duration} | {/if}
{if $bean->getAttribute('chunits')}{$item.units} | {/if}
- {if $bean->getAttribute('chnote')}{$item.note|escape} | {/if}
{if $bean->getAttribute('chcost')}{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if} | {/if}
+ {if $bean->getAttribute('chapproved')}{if $item.approved == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
{if $bean->getAttribute('chpaid')} | {if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
{if $bean->getAttribute('chip')} | {if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}{/if}
{if $bean->getAttribute('chinvoice')} | {$item.invoice|escape} | {/if}
+ {if $bean->getAttribute('chtimesheet')}{$item.timesheet_name|escape} | {/if}
+ {if $bean->getAttribute('chfiles')}{if $item.has_files}{/if} | {/if}
{if $use_checkboxes}
{if 1 == $item.type} | {/if}
{if 2 == $item.type} | {/if}
{/if}
+ {if $bean->getAttribute('chnote') && $item.note}
+
+ {$i18n.label.note}: |
+ {$item.note|escape} |
+
+ {/if}
{$prev_date = $item.date}
{if $print_subtotals} {$prev_grouped_by = $item.grouped_by} {/if}
{/foreach}
@@ -123,11 +135,13 @@
{if $bean->getAttribute('chfinish')} | {/if}
{if $bean->getAttribute('chduration')}{$subtotals[$cur_grouped_by]['time']} | {/if}
{if $bean->getAttribute('chunits')}{$subtotals[$cur_grouped_by]['units']} | {/if}
- {if $bean->getAttribute('chnote')} | {/if}
{if $bean->getAttribute('chcost')}{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chapproved')} | {/if}
{if $bean->getAttribute('chpaid')} | {/if}
{if $bean->getAttribute('chip')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
+ {if $bean->getAttribute('chtimesheet')} | {/if}
+ {if $bean->getAttribute('chfiles')} | {/if}
{if $use_checkboxes} | {/if}
{/if}
@@ -144,11 +158,13 @@
{if $bean->getAttribute('chfinish')} | {/if}
{if $bean->getAttribute('chduration')}{$totals['time']} | {/if}
{if $bean->getAttribute('chunits')}{$totals['units']} | {/if}
- {if $bean->getAttribute('chnote')} | {/if}
{if $bean->getAttribute('chcost')}{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chapproved')} | {/if}
{if $bean->getAttribute('chpaid')} | {/if}
{if $bean->getAttribute('chip')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
+ {if $bean->getAttribute('chtimesheet')} | {/if}
+ {if $bean->getAttribute('chfiles')} | {/if}
{if $use_checkboxes} | {/if}
{/if}
@@ -156,13 +172,22 @@
-{if $report_items && ($use_mark_paid || $use_assign_to_invoice)}
+{if $report_items && ($use_mark_approved || $use_mark_paid || $use_assign_to_invoice || $use_assign_to_timesheet)}