@@ -16,12 +16,14 @@
{if $bean->getAttribute('chduration')}{/if}
+ {if $bean->getAttribute('chunits')}{/if}
{if $bean->getAttribute('chcost')}{/if}
{foreach $subtotals as $subtotal}
{if $subtotal['name']}{$subtotal['name']|escape}{else} {/if} |
{if $bean->getAttribute('chduration')}{$subtotal['time']} | {/if}
+ {if $bean->getAttribute('chunits')}{$subtotal['units']} | {/if}
{if $bean->getAttribute('chcost')}{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if} | {/if}
{/foreach}
@@ -30,6 +32,7 @@
{$i18n.label.total} |
{if $bean->getAttribute('chduration')}{$totals['time']} | {/if}
+ {if $bean->getAttribute('chunits')}{$totals['units']} | {/if}
{if $bean->getAttribute('chcost')}{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if} | {/if}
{else}
@@ -44,6 +47,7 @@
{if $bean->getAttribute('chstart')}{/if}
{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('chpaid')}{/if}
@@ -58,14 +62,15 @@
{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('chpaid')} | {/if}
@@ -91,6 +96,7 @@
{if $bean->getAttribute('chstart')}{$item.start} | {/if}
{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('chpaid')}{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
@@ -108,14 +114,15 @@
{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('chpaid')} | {/if}
@@ -136,6 +143,7 @@
{if $bean->getAttribute('chstart')} | {/if}
{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('chpaid')} | {/if}
@@ -154,7 +162,7 @@
- {$i18n.label.mark_paid}: {$forms.reportForm.mark_paid_select_options.control} {$forms.reportForm.mark_paid_action_options.control} {$forms.reportForm.btn_mark_paid.control} |
+ {$i18n.label.mark_paid}: {$forms.reportViewForm.mark_paid_select_options.control} {$forms.reportViewForm.mark_paid_action_options.control} {$forms.reportViewForm.btn_mark_paid.control} |
|
@@ -163,14 +171,14 @@
- {$i18n.form.report.assign_to_invoice}: {$forms.reportForm.assign_invoice_select_options.control} {$forms.reportForm.recent_invoice.control} {$forms.reportForm.btn_assign.control} |
+ {$i18n.form.report.assign_to_invoice}: {$forms.reportViewForm.assign_invoice_select_options.control} {$forms.reportViewForm.recent_invoice.control} {$forms.reportViewForm.btn_assign.control} |
|
{/if}
{/if}
-{$forms.reportForm.close}
+{$forms.reportViewForm.close}