X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Ftemplates%2Freport.tpl;h=c0f4b2c24cdd512c4dd3084fd24c4baf74ebf2da;hb=6753e281196a94e8a50d9c98d5195093e61fcefb;hp=432159d47f2249d83027a7f9ebe65ed7882a5e59;hpb=5fd6816a0567b31414492712d5002d3ecc9f52a2;p=timetracker.git
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 432159d4..c0f4b2c2 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -47,6 +47,7 @@
{if $bean->getAttribute('chnote')}
{/if}
{if $bean->getAttribute('chcost')}{/if}
{if $bean->getAttribute('chpaid')}{/if}
+ {if $bean->getAttribute('chip')}{/if}
{if $bean->getAttribute('chinvoice')}{/if}
{foreach $report_items as $item}
@@ -68,7 +69,9 @@
{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('chip')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
+ {if $use_checkboxes} | {/if}
|
{/if}
@@ -91,12 +94,11 @@
{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('chpaid')}{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/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('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 $use_checkboxes}
+ {if 1 == $item.type} | {/if}
+ {if 2 == $item.type} | {/if}
{/if}
{$prev_date = $item.date}
@@ -117,7 +119,9 @@
{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('chip')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
+ {if $use_checkboxes} | {/if}
{/if}
@@ -135,22 +139,35 @@
{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('chip')} | {/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}