X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fdunning%2Fshow_invoices.html;h=15acab34674316cca211717d3f9015bf7fd100a0;hb=108f7a8c7ba3137f0e0bcf5142b0269dd25b1115;hp=ce7579b8c201fc4f42b2b1af3578ab627ab3f049;hpb=b16556ccc8e2c1838d5c782b79fd5dcb246b184d;p=kivitendo-erp.git

diff --git a/templates/webpages/dunning/show_invoices.html b/templates/webpages/dunning/show_invoices.html
index ce7579b8c..15acab346 100644
--- a/templates/webpages/dunning/show_invoices.html
+++ b/templates/webpages/dunning/show_invoices.html
@@ -1,19 +1,18 @@
 [%- USE T8 %]
 [% USE HTML %]
-[% USE L %]
-[% L.javascript_tag('jquery.checkall') %]
+[% USE L %][%- USE LxERP -%]
+<h1>[% title %]</h1>
+
 [% SET all_active = 1 %][% FOREACH row = DUNNINGS %][% IF !row.active %][% SET all_active = 0 %][% LAST %][% END %][% END %]
 [% SET all_email = 1 %][% FOREACH row = DUNNINGS %][% IF !row.email %][% SET all_email = 0 %][% LAST %][% END %][% END %]
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/dunning.js"></script>
 
- <div class="listtop" width="100%">[% title %]</div>
-
  <p>[% 'The columns &quot;Dunning Duedate&quot;, &quot;Total Fees&quot; and &quot;Interest&quot; show data for the previous dunning created for this invoice.' | $T8 %]</p>
 
  <form name="Form" method="post" action="dn.pl">
 
-  <table width="100%">
+  <table width="100%" id="dunning_invoice_list">
    <th class="listheading" colspan="2">[% 'Current / Next Level' | $T8 %]</th>
 
    <th class="listheading">
@@ -36,11 +35,14 @@
    <th class="listheading">[% 'Dunning Duedate' | $T8 %]</th>
    <th class="listheading">[% 'Total Fees' | $T8 %]</th>
    <th class="listheading">[% 'Interest' | $T8 %]</th>
+   [% IF l_include_direct_debit %]
+    <th class="listheading">[% 'direct debit' | $T8 %]</th>
+   [% END %]
 
    <!-- Ausgabe der einzelnen Zeilen -->
 
    [% FOREACH row = DUNNINGS %]
-    <tr class="listrow[% loop.count % 2 %]">
+    <tr class="listrow[% loop.count % 2 %][% IF row.direct_debit %] direct_debit[% END %]">
 
      <td>
       <input type="hidden" name="inv_id_[% loop.count %]" size="2" value="[% HTML.escape(row.id) %]">
@@ -60,15 +62,20 @@
      <td><input type="hidden" name="language_id_[% loop.count %]" size="6" value="[% HTML.escape(row.language_id) %]">[% HTML.escape(row.language) %]</td>
      <td>
       <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">
-      <a href="is.pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
+      <a href="[% IF row.invoice %]is[% ELSE %]ar[% END %].pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
      </td>
      <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
      <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
      <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
      <td align="right"><input type="hidden" name="open_amount_[% loop.count %]" size="6" value="[% HTML.escape(row.open_amount) %]">[% HTML.escape(row.open_amount) %]</td>
-     <td>[% HTML.escape(row.next_duedate) %]</td>
+     <td>[% HTML.escape(row.dunning_duedate) %]</td>
      <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
      <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>
+     [% IF l_include_direct_debit %]
+     <td>
+      [% IF row.direct_debit %][% LxERP.t8("yes") %][% ELSE %][% LxERP.t8("no") %][% END %]
+     </td>
+     [% END %]
     </tr>
    [% END %]
   </table>
@@ -94,7 +101,8 @@
 
  </form>
  <script type='text/javascript'>
-   $(function(){$("select[name='language_id']").attr('disabled', $('#force_lang').attr('checked') ? '' : 'disabled')})
-   $('#force_lang').click(function(){ $('select[name="language_id"]').attr('disabled', $('#force_lang').attr('checked') ? '' : 'disabled') })
+   $(function() {
+     $("select[name='language_id']").prop('disabled', $('#force_lang').prop('checked'));
+     $('#force_lang').checkall('select[name="language_id"]', 'disabled');
+   });
  </script>
-