X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fir%2Fform_footer.html;h=e416cf7f65e323faf005587f854ef08f7306217f;hb=a8ab093107924691935126205db483112aa7f50e;hp=83ab34abbbddf361de14862f580e44dd599443e2;hpb=2de7b1da5588237977366ff7e6526f5b7c84a83b;p=kivitendo-erp.git

diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html
index 83ab34abb..e416cf7f6 100644
--- a/templates/webpages/ir/form_footer.html
+++ b/templates/webpages/ir/form_footer.html
@@ -11,17 +11,30 @@
         <tr>
          <th align="left">[% 'Notes' | $T8 %]</th>
          <th align="left">[% 'Internal Notes' | $T8 %]</th>
-         <th align="left">[% 'Payment Options' | $T8 %]</th>
+         <th align="right">[% 'Payment / Delivery Options' | $T8 %]</th>
         </tr>
         <tr valign="top">
          <td>
-          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
+          [% L.textarea_tag("notes", notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
          </td>
          <td>
           <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
          </td>
          <td>
-          [%- L.checkbox_tag('direct_debit', 'checked', direct_debit, 'label', LxERP.t8('direct debit')) %]
+           <table>
+             <tr>
+               <th align="right">[% 'Delivery Terms' | $T8 %] </th>
+               <td>
+                 [% L.select_tag('delivery_term_id', ALL_DELIVERY_TERMS, default = delivery_term_id, with_empty = 1, title_key = 'description', style = 'width: 250px') %]
+               </td>
+             </tr>
+             <tr>
+               <th align="right">[% 'direct debit' | $T8 %]</th>
+               <td>
+                 [%- L.checkbox_tag('direct_debit', 'checked', direct_debit) %]
+               </td>
+             </tr>
+           </table>
          </td>
         </tr>
 [%- IF id && follow_ups.size %]
@@ -33,18 +46,18 @@
 [%- END %]
        </table>
       </td>
+[%- IF show_weight %]
       <td>
        <table>
         <tr>
          <th  align=left>[% 'Total weight' | $T8 %]</th>
          <td>
           [% LxERP.format_amount(totalweight) %] [% HTML.escape(weightunit) %]
-          <input type=hidden name="totalweight" value="[% totalweight %]">
-          <input type=hidden name="weightunit" value="[% HTML.escape(weightunit) %]">
          </td>
         </tr>
        </table>
       </td>
+[%- END %]
       <td align="right">
   [%- IF taxaccounts %]
        <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
@@ -108,28 +121,29 @@
 
     <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="[% 'Update' | $T8 %]">
 [% IF  show_storno %]
-    <input class="submit" type="submit" name="action" value="[% 'Storno' | $T8 %]">
+    [% L.submit_tag("action", LxERP.t8("Storno"), confirm=LxERP.t8('Do you really want to cancel this invoice?')) %]
 [% END %]
     <input class="submit" type="submit" name="action" value="[% 'Post Payment' | $T8 %]">
     <input class="submit" type="submit" name="action" value="[% 'Use As New' | $T8 %]">
 
 [% IF show_delete %]
     <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
+    <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
 [% END %]
 
     <input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
 
  [% ELSE # no id %]
-   [% UNLESS locked %]
       <input class="submit" type="submit" name="action" id="update_button" value="[% 'Update' | $T8 %]">
+   [% UNLESS locked %]
       <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
-      <input class="submit" type="submit" name="action" value="[% 'Save Draft' | $T8 %]">
    [%- END %]
+      <input class="submit" type="submit" name="action" value="[% 'Save Draft' | $T8 %]">
  [% END # id %]
 
   [% IF id %]
       [%#- button for saving history %]
-      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]">
+      <input type="button" class="submit" onclick="set_history_window([% id | html %], 'glid');" name="history" id="history" value="[% 'history' | $T8 %]">
 
       [% IF INSTANCE_CONF.get_ir_show_mark_as_paid %]
           <input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]">