X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fis%2Fform_footer_master.html;h=f795faa1bbb658343f453951b8819bd734d84e90;hb=70ccecab178f9768e989804198ac3bb9e0cfaa68;hp=cc1810885100c7881acba34962384da8f0122c46;hpb=b8916e5c2982dd12e0a612252c85f5e1648e162c;p=kivitendo-erp.git

diff --git a/templates/webpages/is/form_footer_master.html b/templates/webpages/is/form_footer_master.html
index cc1810885..f795faa1b 100644
--- a/templates/webpages/is/form_footer_master.html
+++ b/templates/webpages/is/form_footer_master.html
@@ -58,27 +58,35 @@
   [%- END %]
        <table>
 
-        $subtotal
+[%#- subtotal %]
+[%- UNLESS taxincluded %]
+        <tr>
+         <th align="right"><translate>Subtotal</translate></th>
+         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
+       </tr>
+[%- END %]
 
 [%# tax %]
 [% FOREACH item = taxaccounts_array %]
-[% SET description_ref = item _ 'description' %]
-[% SET rate_ref        = item _ 'rate' %]
-[% SET total_ref       = item _ 'total' %]
-[% SET netto_ref       = item _ 'netto' %]
+[% SET description_ref = item _ '_description' %]
+[% SET rate_ref        = item _ '_rate' %]
+[% SET total_ref       = item _ '_total' %]
+[% SET netto_ref       = item _ '_netto' %]
        <tr>
-        <th align="right">Enthaltene [% $description_ref %]&nbsp;[% $rate_ref * 100 %]%</th>
-        <td align="right">[% $total_ref %]</td>
+        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
+        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
        </tr>
+  [%- IF taxincluded %]
        <tr>
         <th align="right">Nettobetrag</th>
-        <td align="right">[% $netto_ref %]</td>
+        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
        </tr>
+  [%- END %]
 [%- END %]
 
         <tr>
          <th align="right"><translate>Total</translate></th>
-         <td align="right">[% invtotal %]</td>
+         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
         </tr>
        </table>
       </td>
@@ -87,55 +95,21 @@
    </td>
   </tr>
 
-[%- IF webdav %]
-  <tr>
-   <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-   <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-   <table width="100%">
-    <tr>
-     <td align="left" width="30%"><b>Dateiname</b></td>
-     <td align="left" width="70%"><b>Webdavlink</b></td>
-    </tr>
- [%- FOREACH file = WEBDAV %]
-    <tr>
-     <td align="left">[% file.name %]</td>
-     <td align="left"><a href="[% file.link %]">[% file.type %]</a></td>
-    </tr>
- [%- END %]
-   </table>
-  </tr>
-[% END %]
+[% PROCESS 'webdav/_list_<translate>master</translate>.html' %]
 
+[% PROCESS 'is/_payments_<translate>master</translate>.html' %]
 
-  <tr>
-   <td>
-    <table width="100%">
-     <tr class="listheading">
-[% IF is_credit_note %]
-      <th colspan="6" class="listheading"><translate>Payments</translate></th>
-[% ELSE %]
-      <th colspan="6" class="listheading"><translate>Incoming Payments</translate></th>
-[%- END %]
-     </tr>
-
-
-[%# INCLUDE _payments %]
-
-
-    </td>
-  </tr>
   <tr>
     <td><hr size="3" noshade></td>
   </tr>
   <tr>
     <td>
-  [% print_options %]
+[% print_options %]
     </td>
   </tr>
-</table>
+ </table>
+
+
 
   [% IF id %]
 
@@ -149,21 +123,21 @@
     <input class="submit" type="submit" name="action" value="<translate>Post Payment</translate>">
     <input class="submit" type="submit" name="action" value="<translate>Use As Template</translate>">
 
-[% IF id && is_credit_note %]
+[% IF id && is_type_credit_note %]
     <input class="submit" type="submit" name="action" value="<translate>Credit Note</translate>">
 [% END %]
 [% IF show_delete %]
     <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
 [% END %]
 
-  [%- IF invdate > closedto %]
+  [%- UNLESS locked %]
        <input class="submit" type="submit" name="action" value="<translate>Order</translate>">
   [%- END %]
 
     <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
 
  [% ELSE # no id %]
-   [% IF invdate > closedto %]
+   [% UNLESS locked %]
       <input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
       <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
       <input class="submit" type="submit" name="action" value="<translate>Preview</translate>">