X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Freport.tpl;h=2f3a7a39fa6e587865e871670ca45a20e751daaa;hb=70e77a95ac584db9d220b8f6d791baa0de084734;hp=f62929f9faa1fb5c1f5e8780337883315c01854f;hpb=4453de30f591a32c3de8fd71f5b5ad9558d3878e;p=timetracker.git
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index f62929f9..2f3a7a39 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -48,12 +48,13 @@
{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('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}
@@ -72,12 +73,13 @@
{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 $bean->getAttribute('chfiles')} | {/if}
{if $use_checkboxes} | {/if}
|
@@ -99,17 +101,24 @@
{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}
- {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 $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}
@@ -126,12 +135,13 @@
{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 $bean->getAttribute('chfiles')} | {/if}
{if $use_checkboxes} | {/if}
{/if}
@@ -148,12 +158,13 @@
{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('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}
@@ -161,8 +172,17 @@
-{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)}
+ {if $use_mark_approved}
+
+
+
+ {$i18n.label.mark_approved}: {$forms.reportViewForm.mark_approved_select_options.control} {$forms.reportViewForm.mark_approved_action_options.control} {$forms.reportViewForm.btn_mark_approved.control} |
+
+ |
+
+ {/if}
{if $use_mark_paid}
@@ -176,7 +196,16 @@
|
- {$i18n.form.report.assign_to_invoice}: {$forms.reportViewForm.assign_invoice_select_options.control} {$forms.reportViewForm.recent_invoice.control} {$forms.reportViewForm.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_invoice.control} |
+
+ |
+
+ {/if}
+ {if $use_assign_to_timesheet}
+
+
+
+ {$i18n.form.report.assign_to_timesheet}: {$forms.reportViewForm.assign_timesheet_select_options.control} {$forms.reportViewForm.timesheet.control} {$forms.reportViewForm.btn_assign_timesheet.control} |
|
@@ -191,9 +220,6 @@