X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Foe%2Fform_footer_master.html;h=9de0939191ddef0803675336ed2b52adfc292c0e;hb=e0d7849f5e65cf957bbec56d23336fd55e5cd987;hp=e866ff88f7aebc4aff1ced0e3708298492d2ceba;hpb=2a5030b2dcfe53c431a7498b7bae56939020643b;p=kivitendo-erp.git

diff --git a/templates/webpages/oe/form_footer_master.html b/templates/webpages/oe/form_footer_master.html
index e866ff88f..9de093919 100644
--- a/templates/webpages/oe/form_footer_master.html
+++ b/templates/webpages/oe/form_footer_master.html
@@ -57,7 +57,12 @@
             <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b><translate>Tax Included</translate></b><br><br>
 [%- END %]
             <table>
-              [% subtotal %]
+[%- IF NOT taxincluded %]
+              <tr>
+                <th align='right'><translate>Subtotal</translate></th>
+                <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
+              </tr>
+[%- END %]
               [% tax %]
               <tr>
                 <th align="right"><translate>Total</translate></th>
@@ -86,7 +91,7 @@
       <td align="left" width="30%"><b>Dateiname</b></td>
       <td align="left" width="70%"><b>Webdavlink</b></td>
      </tr>
- [%- FOREACH file="WEBDAV" %]
+ [%- FOREACH file = WEBDAV %]
       <tr>
         <td align="left">[% HTML.escape(file.name) %]</td>
         <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
@@ -137,23 +142,27 @@
 
   <input class="submit" type="submit" name="action" value="<translate>Invoice</translate>">
 
-  <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
-  [%- IF is_sales_ord %]
-    <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Quotation</translate>">
-  [%- ELSE %]
-   [%- IF is_pur_ord %]
-    <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
-    <input class="submit" type="submit" name="action" value="<translate>Request for Quotation</translate>">
-   [%- ELSE %]
-    <input class="submit" type="submit" name="action" value="<translate>Order</translate>">
-   [%- END %]
+  [%- IF is_sales_ord || is_pur_ord %]
+    <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
+    [%- IF is_sales_ord %]
+      <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
+     <input class="submit" type="submit" name="action" value="<translate>Quotation</translate>">
+    [%- ELSE %]
+    [%- IF is_pur_ord %]
+      <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
+     <input class="submit" type="submit" name="action" value="<translate>Request for Quotation</translate>">
+    [%- END %]
+    [%- END %]
   [%- END %]
 [%- END %]
-
 <input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
 <input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
 <input type="hidden" name="callback" value="[% callback %]">
+[% IF vc == 'customer' %]
+  <input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
+[% ELSE %]
+  <input type="hidden" name="vendor_discount" value="[% HTML.escape(vendor_discount) %]">
+[% END %]
 
 </form>