is: Payment_terms und duedate ajax gefixt.

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

diff --git a/templates/webpages/is/form_footer_de.html b/templates/webpages/is/form_footer_de.html
index eeae756..7e2a7a3 100644 (file)
--- a/templates/webpages/is/form_footer_de.html
+++ b/templates/webpages/is/form_footer_de.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 %]
         <tr>
-          <td colspan="2">[% follow_up_text %]</td>
+          <td colspan="2">
+            [%- LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.',
+                                     follow_ups.size, follow_ups_unfinished) | html
+            %]
+          <td>
         </tr>
-
+[%- END %]
        </table>
       </td>
       <td>
@@ -58,27 +66,35 @@
   [%- END %]
        <table>
 
-        $subtotal
+[%#- subtotal %]
+[%- UNLESS taxincluded %]
+        <tr>
+         <th align="right">Zwischensumme</th>
+         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
+       </tr>
+[%- END %]
 
 [%# tax %]
 [% FOREACH item = taxaccounts_array %]
-[% SET description_ref = item _ 'description' %]
-[% SET rate_ref        = item _ 'rate' %]
-[% SET total_ref       = item _ 'total' %]
-[% SET netto_ref       = item _ 'netto' %]
+[% SET description_ref = item _ '_description' %]
+[% SET rate_ref        = item _ '_rate' %]
+[% SET total_ref       = item _ '_total' %]
+[% SET netto_ref       = item _ '_netto' %]
        <tr>
-        <th align="right">Enthaltene [% $description_ref %]&nbsp;[% $rate_ref * 100 %]%</th>
-        <td align="right">[% $total_ref %]</td>
+        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
+        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
        </tr>
+  [%- IF taxincluded %]
        <tr>
         <th align="right">Nettobetrag</th>
-        <td align="right">[% $netto_ref %]</td>
+        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
        </tr>
+  [%- END %]
 [%- END %]
 
         <tr>
          <th align="right">Summe</th>
-         <td align="right">[% invtotal %]</td>
+         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
         </tr>
        </table>
       </td>
@@ -87,55 +103,21 @@
    </td>
   </tr>
 
-[%- 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 %]
+[% PROCESS 'webdav/_list_de.html' %]
 
+[% PROCESS 'is/_payments_de.html' %]
 
-  <tr>
-   <td>
-    <table width="100%">
-     <tr class="listheading">
-[% IF is_credit_note %]
-      <th colspan="6" class="listheading">Zahlungsausgänge</th>
-[% ELSE %]
-      <th colspan="6" class="listheading">Zahlungseingänge</th>
-[%- END %]
-     </tr>
-
-
-[%# INCLUDE _payments %]
-
-
-    </td>
-  </tr>
   <tr>
     <td><hr size="3" noshade></td>
   </tr>
   <tr>
     <td>
-  [% print_options %]
+[% print_options %]
     </td>
   </tr>
-</table>
+ </table>
+
+
 
   [% IF id %]
 
@@ -149,21 +131,21 @@
     <input class="submit" type="submit" name="action" value="Zahlung buchen">
     <input class="submit" type="submit" name="action" value="Als Vorlage verwenden">
 
-[% IF id && is_credit_note %]
+[% IF id && is_type_credit_note %]
     <input class="submit" type="submit" name="action" value="Gutschrift">
 [% END %]
 [% IF show_delete %]
     <input class="submit" type="submit" name="action" value="Löschen">
 [% END %]
 
-  [%- IF invdate > closedto %]
+  [%- UNLESS locked %]
        <input class="submit" type="submit" name="action" value="Auftrag">
   [%- END %]
 
     <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
 
  [% ELSE # no id %]
-   [% IF invdate > closedto %]
+   [% UNLESS locked %]
       <input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
       <input class="submit" type="submit" name="action" value="Lieferadresse">
       <input class="submit" type="submit" name="action" value="Druckvorschau">