Merge branch 'master' of ssh://lx-office/~/lx-office-erp

[kivitendo-erp.git] / templates / webpages / do / form_footer_master.html

diff --git a/templates/webpages/do/form_footer_master.html b/templates/webpages/do/form_footer_master.html
index 554a369..cb04003 100644 (file)
--- a/templates/webpages/do/form_footer_master.html
+++ b/templates/webpages/do/form_footer_master.html
@@ -3,7 +3,7 @@
 <!--   <p> -->
 <!--    <table> -->
 
- [%- IF closed %]
+ [%- IF delivered %]
  [%- SET RO = ' readonly' %]
  [%- END %]
 
@@ -55,23 +55,27 @@
 
   <p>
    <translate>Edit the Delivery Order</translate><br>
-   <input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
-   [%- UNLESS closed %]
+   <input type="hidden" name="action" value="dispatcher">
+   <input class="submit" type="submit" name="action_update" id="update_button" value="<translate>Update</translate>">
+   [%- UNLESS delivered %]
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
+   <input class="submit" type="submit" name="action_ship_to" value="<translate>Ship to</translate>">
    [%- END %]
    [%- END %]
-   <input class="submit" type="submit" name="action" value="<translate>Print</translate>">
-   <input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
-   [%- UNLESS closed %]
-   <input class="submit" type="submit" name="action" value="<translate>Save</translate>">
+   <input class="submit" type="submit" name="action_print" value="<translate>Print</translate>">
+   <input class="submit" type="submit" name="action_e_mail" value="<translate>E-mail</translate>">
+   [%- UNLESS delivered %]
+   <input class="submit" type="submit" name="action_save" value="<translate>Save</translate>">
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action" value="<translate>Transfer out and close</translate>">
+   <input class="submit" type="submit" name="action_transfer_out" value="<translate>Transfer out</translate>">
    [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="<translate>Transfer in and close</translate>">
+   <input class="submit" type="submit" name="action_transfer_in" value="<translate>Transfer in</translate>">
    [%- END %]
    [%- END %]
    [%- IF id %]
+   [%- UNLESS closed %]
+   <input class="submit" type="submit" name="action_mark_closed" value="<translate>Mark closed</translate>">
+   [%- END %]
    <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="<translate>history</translate>">
    [%- END %]
   </p>
@@ -79,11 +83,11 @@
   [%- IF id %]
   <p>
    <translate>Workflow Delivery Order</translate><br>
-   <input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
-   [% UNLESS closed %]
-   <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
+   <input class="submit" type="submit" name="action_save_as_new" value="<translate>Save as new</translate>">
+   [% UNLESS delivered %]
+   <input class="submit" type="submit" name="action_delete" value="<translate>Delete</translate>">
    [% END %]
-   <input class="submit" type="submit" name="action" value="<translate>Invoice</translate>">
+   <input class="submit" type="submit" name="action_invoice" value="<translate>Invoice</translate>">
   </p>
   [%- END %]