{if $bean->getAttribute('chtotalsonly')}
-
+
{if $bean->getAttribute('chduration')}{/if}
{if $bean->getAttribute('chcost')}{/if}
{foreach $subtotals as $subtotal}
- {if $subtotal['name']}{$subtotal['name']|escape:'html'}{else} {/if} |
+ {if $subtotal['name']}{$subtotal['name']|escape}{else} {/if} |
{if $bean->getAttribute('chduration')}{$subtotal['time']} | {/if}
{if $bean->getAttribute('chcost')}{if $user->canManageTeam() || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if} | {/if}
@@ -30,47 +30,49 @@
{$i18n.label.total} |
{if $bean->getAttribute('chduration')}{$totals['time']} | {/if}
- {if $bean->getAttribute('chcost')}{$user->currency|escape:'html'} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chcost')}{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if} | {/if}
{else}
-
+
{if $user->canManageTeam() || $user->isClient()}{/if}
{if $bean->getAttribute('chclient')}{/if}
{if $bean->getAttribute('chproject')}{/if}
{if $bean->getAttribute('chtask')}{/if}
- {if $bean->getAttribute('chcf_1')}{/if}
+ {if $bean->getAttribute('chcf_1')}{/if}
{if $bean->getAttribute('chstart')}{/if}
{if $bean->getAttribute('chfinish')}{/if}
{if $bean->getAttribute('chduration')}{/if}
{if $bean->getAttribute('chnote')}{/if}
{if $bean->getAttribute('chcost')}{/if}
- {if $bean->getAttribute('chinvoice')}{/if}
+ {if $bean->getAttribute('chpaid')}{/if}
+ {if $bean->getAttribute('chinvoice')}{/if}
{foreach $report_items as $item}
- {$cur_date = $item.date}
+ {$cur_date = $item.date}
{if $print_subtotals}
{$cur_grouped_by = $item.grouped_by}
{if $cur_grouped_by != $prev_grouped_by && !$first_pass}
{$i18n.label.subtotal}
- {if $user->canManageTeam() || $user->isClient()} | {if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chclient')}{if $group_by == 'client'}{$subtotals[$prev_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chproject')}{if $group_by == 'project'}{$subtotals[$prev_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chtask')}{if $group_by == 'task'}{$subtotals[$prev_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chcf_1')}{if $group_by == 'cf_1'}{$subtotals[$prev_grouped_by]['name']|escape:'html'} | {/if}{/if}
+ {if $user->canManageTeam() || $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 $bean->getAttribute('chstart')} | {/if}
{if $bean->getAttribute('chfinish')} | {/if}
{if $bean->getAttribute('chduration')}{$subtotals[$prev_grouped_by]['time']} | {/if}
{if $bean->getAttribute('chnote')} | {/if}
{if $bean->getAttribute('chcost')}{if $user->canManageTeam() || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chpaid')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
|
{/if}
- {$first_pass = false}
+ {$first_pass = false}
{/if}
{if $cur_date != $prev_date}
@@ -78,18 +80,19 @@
{/if}
{$item.date} |
- {if $user->canManageTeam() || $user->isClient()}{$item.user|escape:'html'} | {/if}
- {if $bean->getAttribute('chclient')}{$item.client|escape:'html'} | {/if}
- {if $bean->getAttribute('chproject')}{$item.project|escape:'html'} | {/if}
- {if $bean->getAttribute('chtask')}{$item.task|escape:'html'} | {/if}
- {if $bean->getAttribute('chcf_1')}{$item.cf_1|escape:'html'} | {/if}
+ {if $user->canManageTeam() || $user->isClient()}{$item.user|escape} | {/if}
+ {if $bean->getAttribute('chclient')}{$item.client|escape} | {/if}
+ {if $bean->getAttribute('chproject')}{$item.project|escape} | {/if}
+ {if $bean->getAttribute('chtask')}{$item.task|escape} | {/if}
+ {if $bean->getAttribute('chcf_1')}{$item.cf_1|escape} | {/if}
{if $bean->getAttribute('chstart')}{$item.start} | {/if}
{if $bean->getAttribute('chfinish')}{$item.finish} | {/if}
{if $bean->getAttribute('chduration')}{$item.duration} | {/if}
- {if $bean->getAttribute('chnote')}{$item.note|escape:'html'} | {/if}
+ {if $bean->getAttribute('chnote')}{$item.note|escape} | {/if}
{if $bean->getAttribute('chcost')}{if $user->canManageTeam() || $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}
{if $bean->getAttribute('chinvoice')}
- | {$item.invoice|escape:'html'} |
+ {$item.invoice|escape} |
{if $use_checkboxes}
{if 1 == $item.type} | {/if}
{if 2 == $item.type} | {/if}
@@ -100,19 +103,20 @@
{if $print_subtotals} {$prev_grouped_by = $item.grouped_by} {/if}
{/foreach}
- {if $print_subtotals}
+ {if $print_subtotals}
{$i18n.label.subtotal}
- {if $user->canManageTeam() || $user->isClient()} | {if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chclient')}{if $group_by == 'client'}{$subtotals[$cur_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chproject')}{if $group_by == 'project'}{$subtotals[$cur_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chtask')}{if $group_by == 'task'}{$subtotals[$cur_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chcf_1')}{if $group_by == 'cf_1'}{$subtotals[$cur_grouped_by]['name']|escape:'html'} | {/if}{/if}
+ {if $user->canManageTeam() || $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 $bean->getAttribute('chstart')} | {/if}
{if $bean->getAttribute('chfinish')} | {/if}
{if $bean->getAttribute('chduration')}{$subtotals[$cur_grouped_by]['time']} | {/if}
{if $bean->getAttribute('chnote')} | {/if}
{if $bean->getAttribute('chcost')}{if $user->canManageTeam() || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chpaid')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
{/if}
@@ -129,7 +133,8 @@
{if $bean->getAttribute('chfinish')} | {/if}
{if $bean->getAttribute('chduration')}{$totals['time']} | {/if}
{if $bean->getAttribute('chnote')} | {/if}
- {if $bean->getAttribute('chcost')}{$user->currency|escape:'html'} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chcost')}{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chpaid')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
{/if}
@@ -156,8 +161,11 @@
-
\ No newline at end of file
+