X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Foe%2Fform_footer.html;h=87c1993a71429ae057bde9ee6e8ea90b1a56b44a;hb=1c25456ea69027b155e625d15d6b0683a5a58f1a;hp=7ad9458708ca89f5bfc376558ec59c0cf0935533;hpb=83542c806dc5c249bf640e344eaf3831cdf2f2ea;p=kivitendo-erp.git

diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html
index 7ad945870..87c1993a7 100644
--- a/templates/webpages/oe/form_footer.html
+++ b/templates/webpages/oe/form_footer.html
@@ -47,6 +47,18 @@
       [%- END %]
       </table>
           </td>
+      [%- IF show_weight %]
+          <td>
+            <table>
+            <tr>
+              <th  align="left">[% 'Total weight' | $T8 %]</th>
+              <td align="right">
+                [% LxERP.format_amount(totalweight, 3) %] [% HTML.escape(weightunit) %]
+              </td>
+            </tr>
+            </table>
+          </td>
+      [%- END %]
 [%- IF is_sales %]
           <td>
             <table>
@@ -96,41 +108,18 @@
       </table>
     </td>
   </tr>
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
+</table>
 
-[%- IF webdav %]
-  <tr>
-    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-  <tr>
-   <td>
-    <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">[% 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>
-  </tr>
-[%- END %]
+</div>
+[%- PROCESS 'webdav/_list.html' %]
+<div id="ui-tabs-1">
+ [%- LxERP.t8("Loading...") %]
+</div>
+</div>
 
-  <tr>
-    <td>
-      [% print_options %]
-    </td>
-  </tr>
-</table>
+<hr size="3" noshade>
+
+<p>[% print_options %]</p>
 
 [% label_edit %]<br>
 <input class="submit" type="submit" name="action_update" id="update_button" value="[% 'Update' | $T8 %]">
@@ -146,7 +135,10 @@
 
   <br>[% label_workflow %]<br>
   <input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
-  <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+
+  [%- UNLESS (is_sales_ord && !INSTANCE_CONF.get_sales_order_show_delete) || (is_pur_ord && !INSTANCE_CONF.get_purchase_order_show_delete) %]
+    <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+  [%- END %]
 
   [%- IF is_sales_quo %]
     <input class="submit" type="submit" name="action_sales_order" value="[% 'Sales Order' | $T8 %]">
@@ -186,14 +178,3 @@
 [% END %]
 
 </form>
-
-
-    <script type="text/javascript">
-     <!--
-       $('document').ready(function(){
-         setupDateFormat('[% dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
-         setupPoints('[% numberformat %]', '[% 'wrongformat' | $T8 %]');
-       });
-     //-->
-    </script>
-</body>