X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=WEB-INF%2Ftemplates%2Freport.tpl;h=f99a3fb9ca5ac873f7186517103721a402f27153;hb=d47d579964586e1edeb197882eca183600e4aaa1;hp=b6ee95ce92e3e10188df5a82cf3b836cea469896;hpb=7d4e14287bbbd83a07b093e97ac53266494b7628;p=timetracker.git
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index b6ee95ce..f99a3fb9 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -69,6 +69,7 @@
{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}
@@ -91,12 +92,10 @@
{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('chinvoice')}{$item.invoice|escape} | {/if}
+ {if $use_checkboxes}
+ {if 1 == $item.type} | {/if}
+ {if 2 == $item.type} | {/if}
{/if}
{$prev_date = $item.date}
@@ -118,6 +117,7 @@
{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}
@@ -136,21 +136,33 @@
{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}
- {$forms.reportForm.recent_invoice.control} {$forms.reportForm.btn_submit.control} |
+ {$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}
+
+
+
+ {$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}
@@ -161,9 +173,6 @@