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

diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 432159d4..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}
@@ -91,12 +92,10 @@
     {if $bean->getAttribute('chnote')}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
     {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->canManageTeam() || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
     {if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
-    {if $bean->getAttribute('chinvoice')}
-        <td class="cellRightAligned">{$item.invoice|escape}</td>
-      {if $use_checkboxes}
-        {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
-        {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
-      {/if}
+    {if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
+    {if $use_checkboxes}
+      {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
+      {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
     {/if}
       </tr>
     {$prev_date = $item.date}
@@ -118,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 -->
@@ -136,21 +136,33 @@
     {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_checkboxes && $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>
+        <tr><td>{$i18n.label.mark_paid}: {$forms.reportForm.mark_paid_select_options.control} {$forms.reportForm.mark_paid_action_options.control} {$forms.reportForm.btn_mark_paid.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  {/if}
+  {if $use_assign_to_invoice}
   <tr>
     <td align="right">
       <table>
-        <tr><td>{$forms.reportForm.recent_invoice.control} {$forms.reportForm.btn_submit.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}