X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Freport.tpl;h=44a6e337661ec1d80012cc0a0ae7169e20043d0e;hb=9c8422b2c186feac1b572f09ab27d4c754d5e492;hp=3cd8e40ec8d5961a7a55073bcbe50bb99e0d1bd7;hpb=eb300930267977a1caac0355200467e4bdf8b655;p=timetracker.git
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 3cd8e40e..44a6e337 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -50,9 +50,11 @@
{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}
{foreach $report_items as $item}
@@ -73,9 +75,11 @@
{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 $use_checkboxes} | {/if}
|
@@ -99,9 +103,11 @@
{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('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 $use_checkboxes}
{if 1 == $item.type} | {/if}
{if 2 == $item.type} | {/if}
@@ -125,9 +131,11 @@
{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 $use_checkboxes} | {/if}
{/if}
@@ -146,9 +154,11 @@
{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 $use_checkboxes} | {/if}
{/if}
@@ -156,8 +166,17 @@
-{if $report_items && ($use_mark_paid || $use_assign_to_invoice)}
+{if $report_items && ($use_mark_approved || $use_mark_paid || $use_assign_to_invoice)}
+ {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}
@@ -186,9 +205,6 @@
|