X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Foe%2Forders_footer_master.html;h=e866ff88f7aebc4aff1ced0e3708298492d2ceba;hb=ee82a6ce45291872bfb41d178352b61a9b9be957;hp=92ac4b5f958f0faf9a93e07a9ed9af351c0c85c1;hpb=7a7f33b5c1b3531ab761adba1cf19d4ad68cffcd;p=kivitendo-erp.git

diff --git a/templates/webpages/oe/orders_footer_master.html b/templates/webpages/oe/orders_footer_master.html
index 92ac4b5f9..e866ff88f 100644
--- a/templates/webpages/oe/orders_footer_master.html
+++ b/templates/webpages/oe/orders_footer_master.html
@@ -2,98 +2,101 @@
 [%- USE LxERP %]
   <tr>
     <td>
-      <table width=100%>
-	<tr valign=bottom>
-	  <td>
-	    <table>
-	      <tr>
-		<th align=left><translate>Notes</translate></th>
-		<th align=left><translate>Internal Notes</translate></th>
-	      </tr>
-	      <tr valign=top>
-		<td>[% notes %]</td>
+      <table width="100%">
+        <tr valign="bottom">
+          <td>
+            <table>
+              <tr>
+                <th align="left"><translate>Notes</translate></th>
+                <th align="left"><translate>Internal Notes</translate></th>
+              </tr>
+              <tr valign="top">
+                <td>[% notes %]</td>
                 <td>[% intnotes %]</td>
-	      </tr>
+              </tr>
               <tr>
                 <th align="right"><translate>Payment Terms</translate></th>
                 <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'payment_id', 
-                           style      = 'width: 250px', 
-                           DATA       = ALL_PAYMENTS, 
-                           id_key     = 'id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'payment_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_PAYMENTS,
+                           id_key     = 'id',
                            label_key  = 'description',
                            show_empty = 1 -%]
                 </td>
-	    </tr>
+            </tr>
       [%- IF id && num_follow_ups %]
       <tr>
        <td colspan="2">[% LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>', num_follow_ups, num_due_follow_ups) %]</td>
       </tr>
       [%- END %]
       </table>
-	  </td>
+          </td>
 [%- IF is_sales %]
           <td>
             <table>
 
             <tr>
-              <th  align=left><translate>Ertrag</translate></th>
+              <th  align="left"><translate>Ertrag</translate></th>
               <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
             </tr>
             <tr>
-              <th  align=left><translate>Ertrag prozentual</translate></th>
+              <th  align="left"><translate>Ertrag prozentual</translate></th>
               <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
               <td>%</td>
             </tr>
 
-            <input type=hidden name="marge_total" value="[% marge_total %]">
-            <input type=hidden name="marge_percent" value="[% marge_percent %]">
+            <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
+            <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
             </table>
           </td>
 [%- END %]
-	  <td align=right>
+          <td align="right">
 [%- IF taxaccounts %]
-            <input name=taxincluded class=checkbox type=checkbox value=1 [% IF taxincluded %]checked[% END %]><b><translate>Tax Included</translate></b><br><br>
+            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b><translate>Tax Included</translate></b><br><br>
 [%- END %]
-	    <table>
-	      [% subtotal %]
-	      [% tax %]
-	      <tr>
-		<th align=right><translate>Total</translate></th>
-		<td align=right>[% LxERP.format_amount(invtotal, 2) %]</td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
+            <table>
+              [% subtotal %]
+              [% tax %]
+              <tr>
+                <th align="right"><translate>Total</translate></th>
+                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
       </table>
     </td>
   </tr>
-<input type=hidden name=oldinvtotal value="[% HTML.escape(oldinvtotal) %]">
-<input type=hidden name=oldtotalpaid value="[% HTML.escape(totalpaid) %]">
+  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
+  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
   <tr>
-    <td><hr size=3 noshade></td>
+    <td><hr size="3" noshade></td>
   </tr>
 
 [%- IF webdav %]
   <tr>
-    <th class=listtop align=left>Dokumente im Webdav-Repository</th>
+    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
   </tr>
-    <table width=100%>
+  <tr>
+   <td>
+    <table width="100%">
      <tr>
-      <td align=left width=30%><b>Dateiname</b></td>
-      <td align=left width=70%><b>Webdavlink</b></td>
+      <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">[% file.name %]</td>
-        <td align="left"><a href="[% file.link %]">[% file.type %]</a></td>
+        <td align="left">[% HTML.escape(file.name) %]</td>
+        <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
       </tr>
  [%- END %]
     </table>
+   </td>
   </tr>
   <tr>
-    <td><hr size=3 noshade></td>
+    <td><hr size="3" noshade></td>
   </tr>
 [%- END %]
 
@@ -105,48 +108,52 @@
 </table>
 
 [% label_edit %]<br>
-<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>Print</translate>">
-<input class=submit type=submit name=action value="<translate>E-mail</translate>">
-<input class=submit type=submit name=action value="<translate>Save</translate>">
-<input class=submit type=submit name=action value="<translate>Save and Close</translate>">
+<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>Print</translate>">
+<input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
+<input class="submit" type="submit" name="action" value="<translate>Save</translate>">
+<input class="submit" type="submit" name="action" value="<translate>Save and Close</translate>">
 
 [%- IF id %]
   <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
   <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="<translate>history</translate>">
 
   <br>[% label_workflow %]<br>
-  <input class=submit type=submit name=action value="<translate>Save as new</translate>">
-  <input class=submit type=submit name=action value="<translate>Delete</translate>">
+  <input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
+  <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
 
   [%- IF is_sales_quo %]
-    <input class=submit type=submit name=action value="<translate>Sales Order</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
   [%- END %]
 
   [%- IF is_req_quo %]
-    <input class=submit type=submit name=action value="<translate>Purchase Order</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
+  [%- END %]
+
+  [%- IF is_sales_ord || is_pur_ord %]
+    <input class="submit" type="submit" name="action" value="<translate>Delivery Order</translate>">
   [%- END %]
 
-  <input class=submit type=submit name=action value="<translate>Invoice</translate>">
+  <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>">
+    <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>">
+    <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>">
+    <input class="submit" type="submit" name="action" value="<translate>Order</translate>">
    [%- 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 %]">
+<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 %]">
 
 </form>