X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fis%2Fform_footer_master.html;h=128618d1e97a9c14b14b0a9d75efab3a0a4742cd;hb=e0d7849f5e65cf957bbec56d23336fd55e5cd987;hp=b7548d7ea0fb0eb0988fd1ca71a6b851a910a22f;hpb=7130d91ec4941cad5aba49bdd39911a2d5fa9a89;p=kivitendo-erp.git

diff --git a/templates/webpages/is/form_footer_master.html b/templates/webpages/is/form_footer_master.html
index b7548d7ea..128618d1e 100644
--- a/templates/webpages/is/form_footer_master.html
+++ b/templates/webpages/is/form_footer_master.html
@@ -19,20 +19,28 @@
           <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 && follow_ups.size %]
         <tr>
-          <td colspan="2">[% follow_up_text %]</td>
+          <td colspan="2">
+            [%- LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>',
+                                     follow_ups.size, follow_ups_unfinished) | html
+            %]
+          <td>
         </tr>
-
+[%- END %]
        </table>
       </td>
       <td>
@@ -58,7 +66,6 @@
   [%- END %]
        <table>
 
-[%#- subtotal %]
 [%- UNLESS taxincluded %]
         <tr>
          <th align="right"><translate>Subtotal</translate></th>
@@ -86,7 +93,7 @@
 
         <tr>
          <th align="right"><translate>Total</translate></th>
-         <td align="right">[% invtotal %]</td>
+         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
         </tr>
        </table>
       </td>
@@ -95,35 +102,10 @@
    </td>
   </tr>
 
-[%#--------------------------- WEB DAV BLOCK %]
-[%- IF webdav %]
-  <tr>
-   <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-   <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-   <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">[% file.name %]</td>
-     <td align="left"><a href="[% file.link %]">[% file.type %]</a></td>
-    </tr>
- [%- END %]
-   </table>
-  </tr>
-[% END %]
-[%#--------------------------- WEB DAV BLOCK %]
-
+[% PROCESS 'webdav/_list_<translate>master</translate>.html' %]
 
 [% PROCESS 'is/_payments_<translate>master</translate>.html' %]
 
-
-
   <tr>
     <td><hr size="3" noshade></td>
   </tr>
@@ -148,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_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 %]
@@ -185,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>