X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Freport.tpl;h=f99a3fb9ca5ac873f7186517103721a402f27153;hb=3e2b8759b928e8120cb6d804098b3dcdc3996cc8;hp=a05618db94dbc373124240cf5afca2fccba73e44;hpb=7ece3d4c1cf7c91fc469373a6b8a997fd4ea3398;p=timetracker.git
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index a05618db..f99a3fb9 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -46,6 +46,7 @@
{if $bean->getAttribute('chduration')}
{/if}
{if $bean->getAttribute('chnote')}{/if}
{if $bean->getAttribute('chcost')}{/if}
+ {if $bean->getAttribute('chpaid')}{/if}
{if $bean->getAttribute('chinvoice')}{/if}
{foreach $report_items as $item}
@@ -66,7 +67,9 @@
{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 $use_checkboxes} | {/if}
|
{/if}
@@ -88,12 +91,11 @@
{if $bean->getAttribute('chduration')}{$item.duration} | {/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('chinvoice')}
- {$item.invoice|escape} |
- {if $use_checkboxes}
- {if 1 == $item.type} | {/if}
- {if 2 == $item.type} | {/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} | {/if}
+ {if $use_checkboxes}
+ {if 1 == $item.type} | {/if}
+ {if 2 == $item.type} | {/if}
{/if}
{$prev_date = $item.date}
@@ -113,7 +115,9 @@
{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 $use_checkboxes} | {/if}
{/if}
@@ -130,22 +134,35 @@
{if $bean->getAttribute('chduration')}{$totals['time']} | {/if}
{if $bean->getAttribute('chnote')} | {/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 $use_checkboxes} | {/if}
{/if}
-{if $use_checkboxes && $report_items}
-
+{if $report_items && ($use_mark_paid || $use_assign_to_invoice)}
+
+ {if $use_mark_paid}
+
+
+
+ {$i18n.label.mark_paid}: {$forms.reportForm.mark_paid_select_options.control} {$forms.reportForm.mark_paid_action_options.control} {$forms.reportForm.btn_mark_paid.control} |
+
+ |
+
+ {/if}
+ {if $use_assign_to_invoice}
- {$forms.reportForm.recent_invoice.control} {$forms.reportForm.btn_submit.control} |
+ {$i18n.form.report.assign_to_invoice}: {$forms.reportForm.assign_invoice_select_options.control} {$forms.reportForm.recent_invoice.control} {$forms.reportForm.btn_assign.control} |
|
+ {/if}
{/if}
{$forms.reportForm.close}