@@ -50,9 +50,11 @@
{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}
{foreach $report_items as $item}
@@ -62,20 +64,22 @@
{if $cur_grouped_by != $prev_grouped_by && !$first_pass}
{$i18n.label.subtotal}
- {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()} | {if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape} | {/if}{/if}
- {if $bean->getAttribute('chclient')}{if $group_by == 'client'}{$subtotals[$prev_grouped_by]['name']|escape} | {/if}{/if}
- {if $bean->getAttribute('chproject')}{if $group_by == 'project'}{$subtotals[$prev_grouped_by]['name']|escape} | {/if}{/if}
- {if $bean->getAttribute('chtask')}{if $group_by == 'task'}{$subtotals[$prev_grouped_by]['name']|escape} | {/if}{/if}
- {if $bean->getAttribute('chcf_1')}{if $group_by == 'cf_1'}{$subtotals[$prev_grouped_by]['name']|escape} | {/if}{/if}
+ {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}{$subtotals[$prev_grouped_by]['user']|escape} | {/if}
+ {if $bean->getAttribute('chclient')}{$subtotals[$prev_grouped_by]['client']|escape} | {/if}
+ {if $bean->getAttribute('chproject')}{$subtotals[$prev_grouped_by]['project']|escape} | {/if}
+ {if $bean->getAttribute('chtask')}{$subtotals[$prev_grouped_by]['task']|escape} | {/if}
+ {if $bean->getAttribute('chcf_1')}{$subtotals[$prev_grouped_by]['cf_1']|escape} | {/if}
{if $bean->getAttribute('chstart')} | {/if}
{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 $use_checkboxes} | {/if}
|
@@ -99,9 +103,11 @@
{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 $use_checkboxes}
{if 1 == $item.type} | {/if}
{if 2 == $item.type} | {/if}
@@ -114,20 +120,22 @@
{if $print_subtotals}
{$i18n.label.subtotal}
- {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()} | {if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape} | {/if}{/if}
- {if $bean->getAttribute('chclient')}{if $group_by == 'client'}{$subtotals[$cur_grouped_by]['name']|escape} | {/if}{/if}
- {if $bean->getAttribute('chproject')}{if $group_by == 'project'}{$subtotals[$cur_grouped_by]['name']|escape} | {/if}{/if}
- {if $bean->getAttribute('chtask')}{if $group_by == 'task'}{$subtotals[$cur_grouped_by]['name']|escape} | {/if}{/if}
- {if $bean->getAttribute('chcf_1')}{if $group_by == 'cf_1'}{$subtotals[$cur_grouped_by]['name']|escape} | {/if}{/if}
+ {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}{$subtotals[$cur_grouped_by]['user']|escape} | {/if}
+ {if $bean->getAttribute('chclient')}{$subtotals[$cur_grouped_by]['client']|escape} | {/if}
+ {if $bean->getAttribute('chproject')}{$subtotals[$cur_grouped_by]['project']|escape} | {/if}
+ {if $bean->getAttribute('chtask')}{$subtotals[$cur_grouped_by]['task']|escape} | {/if}
+ {if $bean->getAttribute('chcf_1')}{$subtotals[$cur_grouped_by]['cf_1']|escape} | {/if}
{if $bean->getAttribute('chstart')} | {/if}
{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 $use_checkboxes} | {/if}
{/if}
@@ -146,9 +154,11 @@
{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 $use_checkboxes} | {/if}
{/if}
@@ -156,13 +166,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)}