X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Freport.tpl;h=f99a3fb9ca5ac873f7186517103721a402f27153;hb=3f7ed883e1c7d75aacc49900b403f8e84a68dc3f;hp=e98e14cebd6f9ec6624c94b7b69f3d3ab1dacf86;hpb=7b5468067f8be75bb9bd389756a0dc824d0d4f9a;p=timetracker.git

diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index e98e14ce..f99a3fb9 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -69,6 +69,7 @@
         {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
         {if $bean->getAttribute('chpaid')}<td></td>{/if}
         {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+        {if $use_checkboxes}<td></td>{/if}
       </tr>
       <tr><td>&nbsp;</td></tr>
       {/if}
@@ -116,6 +117,7 @@
     {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+    {if $use_checkboxes}<td></td>{/if}
       </tr>
   {/if}
   <!-- print totals -->
@@ -134,14 +136,16 @@
     {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td></td>{/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
+    {if $use_checkboxes}<td></td>{/if}
       </tr>
 {/if}
     </table>
   </td>
 </tr>
 </table>
-{if $use_mark_paid && $report_items}
-<table width="720" cellspacing="4" cellpadding="4" border="0">
+{if $report_items && ($use_mark_paid || $use_assign_to_invoice)}
+<table width="720" cellspacing="0" cellpadding="0" border="0">
+  {if $use_mark_paid}
   <tr>
     <td align="right">
       <table>
@@ -149,17 +153,16 @@
       </table>
     </td>
   </tr>
-</table>
-{/if}
-{if $use_assign_to_invoice && $report_items}
-<table width="720" cellspacing="4" cellpadding="4" border="0">
+  {/if}
+  {if $use_assign_to_invoice}
   <tr>
     <td align="right">
       <table>
-        <tr><td>{$i18n.form.report.assign_to_invoice}: {$forms.reportForm.recent_invoice.control} {$forms.reportForm.btn_assign.control}</td></tr>
+        <tr><td>{$i18n.form.report.assign_to_invoice}: {$forms.reportForm.assign_invoice_select_options.control} {$forms.reportForm.recent_invoice.control} {$forms.reportForm.btn_assign.control}</td></tr>
       </table>
     </td>
   </tr>
+  {/if}
 </table>
 {/if}
 {$forms.reportForm.close}