X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Freport.tpl;h=a98d71aa05302bef8e07a09189b25b71be85d1dd;hb=9c1005341a3db52333fcb732960acbdf03fbe4e7;hp=d0304a9fcd5a89fd887830972578a505b107e7be;hpb=c3e6cb49a67ee660c2eaeef53e15c85c19d805dd;p=timetracker.git
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index d0304a9f..a98d71aa 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -48,6 +48,7 @@
{if $bean->getAttribute('chfinish')}
{/if}
{if $bean->getAttribute('chduration')}{/if}
{if $bean->getAttribute('chunits')}{/if}
+ {if $bean->getAttribute('chnote') && !$note_on_separate_row}{/if}
{if $bean->getAttribute('chcost')}{/if}
{if $bean->getAttribute('chapproved')}{/if}
{if $bean->getAttribute('chpaid')}{/if}
@@ -73,6 +74,7 @@
{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') && !$note_on_separate_row} | {/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}
@@ -101,10 +103,11 @@
{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') && !$note_on_separate_row}{$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('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}
@@ -113,7 +116,7 @@
{if 2 == $item.type} | {/if}
{/if}
- {if $bean->getAttribute('chnote') && $item.note}
+ {if $note_on_separate_row && $bean->getAttribute('chnote') && $item.note}
{$i18n.label.note}: |
{$item.note|escape} |
@@ -135,6 +138,7 @@
{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') && !$note_on_separate_row} | {/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}
@@ -158,6 +162,7 @@
{if $bean->getAttribute('chfinish')} | {/if}
{if $bean->getAttribute('chduration')}{$totals['time']} | {/if}
{if $bean->getAttribute('chunits')}{$totals['units']} | {/if}
+ {if $bean->getAttribute('chnote') && !$note_on_separate_row} | {/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}