X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Freport.tpl;h=a98d71aa05302bef8e07a09189b25b71be85d1dd;hb=e3cdaaf8e6b4e5433ec620396e562de1a5dcec10;hp=9e215c4dfa5875a3532e98c3a49e599bd0f8041a;hpb=d5923832a32b1f43cbc6c5d74bbd064888761c80;p=timetracker.git
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 9e215c4d..a98d71aa 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -48,13 +48,14 @@
{if $bean->getAttribute('chfinish')}
{/if}
{if $bean->getAttribute('chduration')}{/if}
{if $bean->getAttribute('chunits')}{/if}
- {if $bean->getAttribute('chnote')}{/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}
{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}
@@ -73,13 +74,14 @@
{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('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}
{if $bean->getAttribute('chip')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
{if $bean->getAttribute('chtimesheet')} | {/if}
+ {if $bean->getAttribute('chfiles')} | {/if}
{if $use_checkboxes} | {/if}
|
@@ -101,18 +103,25 @@
{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('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}
{if $use_checkboxes}
{if 1 == $item.type} | {/if}
{if 2 == $item.type} | {/if}
{/if}
+ {if $note_on_separate_row && $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}
@@ -129,13 +138,14 @@
{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('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}
{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}
@@ -152,13 +162,14 @@
{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('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}
{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}