Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

[kivitendo-erp.git] / templates / webpages / do / form_footer.html
diff --git a/templates/webpages/do/form_footer.html b/templates/webpages/do/form_footer.html

index a6a5129..364367b 100644 (file)
--- a/templates/webpages/do/form_footer.html
+++ b/templates/webpages/do/form_footer.html
@@ -1,9 +1,5 @@
  [%- USE T8 %]
-[% USE HTML %][% USE LxERP %]<!-- <body> -->
-<!--  <form> -->
-<!--   <p> -->
-<!--    <table> -->
-
+[% USE HTML %][% USE LxERP %]
   [%- IF delivered %]
   [%- SET RO = ' readonly' %]
   [%- END %]
@@ -74,6 +70,7 @@
     [%- END %]
     [%- END %]
     [%- IF id %]
+     <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
     [%- UNLESS closed %]
     <input class="submit" type="submit" name="action_mark_closed" value="[% 'Mark closed' | $T8 %]">
     [%- END %]
@@ -85,8 +82,8 @@
    <p>
     [% 'Workflow Delivery Order' | $T8 %]<br>
     <input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
-   [% UNLESS delivered %]
-   <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+   [% UNLESS delivered || (vc == 'customer' && !INSTANCE_CONF.get_sales_delivery_order_show_delete) || (vc == 'vendor' && !INSTANCE_CONF.get_purchase_delivery_order_show_delete) %]
+     <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
     [% END %]
     <input class="submit" type="submit" name="action_invoice" value="[% 'Invoice' | $T8 %]">
    </p>
@@ -113,5 +110,3 @@
      }
    }
  </script>
-</body>
-</html>