X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Finvoice_view.tpl;h=6441b44dbf58e79847746095a5d70befb8a902c4;hb=2b39252b38f5bd1be462224fe781a40f5b0ddf95;hp=ceeeffc9bc5dd5c7673fcad9529194904ec780f8;hpb=9a23a8c0a51b7ec38a96f525484134f3cb85dc7e;p=timetracker.git

diff --git a/WEB-INF/templates/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl
index ceeeffc9..6441b44d 100644
--- a/WEB-INF/templates/invoice_view.tpl
+++ b/WEB-INF/templates/invoice_view.tpl
@@ -6,62 +6,81 @@
   <tr>
     <td>
       <table border=0 width=100%>
-        <tr><td align="center"><b style="font-size: 15pt; font-family: Arial, Helvetica, sans-serif;">{$i18n.title.invoice} {$invoice_name|escape:'html'} </b></td></tr>
-        <tr><td align='left'><b>{$i18n.label.date}:</b> {$invoice_date}</td></tr>
-        <tr><td align='left'><b>{$i18n.label.client}:</b> {$client_name|escape:'html'}</td></tr>
-        <tr><td align='left'><b>{$i18n.label.client_address}:</b> {$client_address|escape:'html'}</td></tr>
+        <tr><td align="center"><b style="font-size: 15pt; font-family: Arial, Helvetica, sans-serif;">{$i18n.title.invoice} {$invoice_name|escape} </b></td></tr>
+        <tr><td align="left"><b>{$i18n.label.date}:</b> {$invoice_date}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.client}:</b> {$client_name|escape}</td></tr>
+        <tr><td align="left"><b>{$i18n.label.client_address}:</b> {$client_address|escape}</td></tr>
       </table>
     </td>
   </tr>
   <tr>
     <td valign="top">
 {if $invoice_items}
-      <table border='0' cellpadding='3' cellspacing='1' width="100%">
+      <table border="0" cellpadding="3" cellspacing="1" width="100%">
         <tr>
           <td class="tableHeader">{$i18n.label.date}</td>
           <td class="tableHeader">{$i18n.form.invoice.person}</td>
-  {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_project}
           <td class="tableHeader">{$i18n.label.project}</td>
   {/if}
-  {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+  {if $show_task}
           <td class="tableHeader">{$i18n.label.task}</td>
   {/if}
           <td class="tableHeader">{$i18n.label.note}</td>
           <td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>
           <td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>
+  {if $user->isPluginEnabled('ps')}
+          <td class="tableHeader">{$i18n.label.paid}</td>
+  {/if}
         </tr>
   {foreach $invoice_items as $invoice_item}
-        <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
-          <td valign='top'>{$invoice_item.date}</td>
-          <td valign='top'>{$invoice_item.user_name|escape:'html'}</td>
-    {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-          <td valign='top'>{$invoice_item.project_name|escape:'html'}</td>
+        <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td valign="top">{$invoice_item.date}</td>
+          <td valign="top">{$invoice_item.user_name|escape}</td>
+    {if $show_project}
+          <td valign="top">{$invoice_item.project_name|escape}</td>
+    {/if}
+    {if $show_task}
+          <td valign="top">{$invoice_item.task_name|escape}</td>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}        
-          <td valign='top'>{$invoice_item.task_name|escape:'html'}</td>
+          <td valign="top">{$invoice_item.note|escape}</td>
+          <td align="right" valign="top">{$invoice_item.duration}</td>
+          <td align="right" valign="top">{$invoice_item.cost}</td>
+    {if $user->isPluginEnabled('ps')}
+          <td align="right" valign="top">{if $invoice_item.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
     {/if}
-          <td valign='top'>{$invoice_item.note|escape:'html'}</td>
-          <td align='right' valign='top'>{$invoice_item.duration}</td>
-          <td align='right' valign='top'>{$invoice_item.cost}</td>
         </tr>
   {/foreach}
         <tr><td>&nbsp;</td></tr>
   {if $tax}
         <tr>
           <td align="right" colspan="{$colspan}"><b>{$i18n.label.subtotal}:</b></td>
-          <td align="right"><nobr>{$subtotal|escape:'html'}</nobr></td>
+          <td align="right"><nobr>{$subtotal|escape}</nobr></td>
         </tr>
         <tr>
           <td align="right" colspan="{$colspan}"><b>{$i18n.label.tax}:</b></td>
-          <td align="right"><nobr>{$tax|escape:'html'}</nobr></td>
+          <td align="right"><nobr>{$tax|escape}</nobr></td>
         </tr>
    {/if}
         <tr>
           <td align="right" colspan="{$colspan}"><b>{$i18n.label.total}:</b></td>
-          <td align="right"><nobr>{$total|escape:'html'}</nobr></td>
+          <td align="right"><nobr>{$total|escape}</nobr></td>
         </tr>
-        
-  	  </table>
+      </table>
+
+  {$forms.invoiceForm.open}
+  {if $user->isPluginEnabled('ps')}
+  <table width="720" cellspacing="0" cellpadding="0" border="0">
+  <tr>
+    <td align="right">
+      <table>
+        <tr><td>{$i18n.label.mark_paid}: {$forms.invoiceForm.mark_paid_action_options.control} {$forms.invoiceForm.btn_mark_paid.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  </table>
+  {/if}
+  {$forms.invoiceForm.close}
 {/if}
     </td>
   </tr>
@@ -69,6 +88,3 @@
     <input type="button" onclick="chLocation('invoice_send.php?id={$invoice_id}');" value="{$i18n.button.send_by_email}">
   </form></td></tr>
 </table>
-
-
-