Rechnungen sollen noch am selben Tag bearbeitbar sein. Fix für Bug1256. Anzeige für...

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

diff --git a/templates/webpages/is/form_footer_master.html b/templates/webpages/is/form_footer_master.html
index b1719f4..128618d 100644 (file)
--- a/templates/webpages/is/form_footer_master.html
+++ b/templates/webpages/is/form_footer_master.html
@@ -19,17 +19,20 @@
           <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
          </td>
          <td>
-          <select id='payment_id' name="payment_id">
-
-           $payment
-
-          </select>
-          <script type='text/javascript'>$('#payment_id').onchange(function(){
+            [%- INCLUDE 'generic/multibox.html'
+                 name          = 'payment_id',
+                 style         = 'width: 250px',
+                 DATA          = payment_terms,
+                 id_key        = 'id',
+                 label_key     = 'description',
+                 show_empty    = 1
+                 allow_textbox = 0 -%]
+          <script type='text/javascript'>$('#payment_id').change(function(){
             if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])})
           </script>
          </td>
         </tr>
-[%- IF id %]
+[%- IF id && follow_ups.size %]
         <tr>
           <td colspan="2">
             [%- LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>',
@@ -63,7 +66,6 @@
   [%- END %]
        <table>
 
-[%#- subtotal %]
 [%- UNLESS taxincluded %]
         <tr>
          <th align="right"><translate>Subtotal</translate></th>
@@ -128,11 +130,12 @@
     <input class="submit" type="submit" name="action" value="<translate>Post Payment</translate>">
     <input class="submit" type="submit" name="action" value="<translate>Use As Template</translate>">
 
-[% IF id && is_type_credit_note %]
+[% IF id && !is_type_credit_note %]
     <input class="submit" type="submit" name="action" value="<translate>Credit Note</translate>">
 [% END %]
 [% IF show_delete %]
     <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Post</translate>">
 [% END %]
 
   [%- UNLESS locked %]
@@ -165,7 +168,7 @@
 <input type="hidden" name="draft_id" value="[% draft_id %]">
 <input type="hidden" name="draft_description" value="[% draft_description %]">
 <input type="hidden" name="customer_discount" value="[% customer_discount %]">
-
+<input type="hidden" name="gldate" value="[% gldate %]">
 </form>
 
 </body>