X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fdunning%2Fedit_config_master.html;h=3d8cb6095138657bab70894255363de8e2aec2b3;hb=7c128d33b4db9f5d2a090a04ffdcb9e08a0a3db3;hp=870f7525a72c1a9ba5df198ca7ffbc3746a93daf;hpb=666316593d4b95e5835305e02943538bf578589c;p=kivitendo-erp.git

diff --git a/templates/webpages/dunning/edit_config_master.html b/templates/webpages/dunning/edit_config_master.html
index 870f7525a..3d8cb6095 100644
--- a/templates/webpages/dunning/edit_config_master.html
+++ b/templates/webpages/dunning/edit_config_master.html
@@ -2,16 +2,6 @@
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/dunning.js"></script>
 
- <script type="text/javascript">
-  <!--
-      function enable_invoice_controls(enable) {
-        document.Form.AR.disabled                 = !enable;
-        document.Form.AR_amount_fee.disabled      = !enable;
-        document.Form.AR_amount_interest.disabled = !enable;
-      }
-    -->
- </script>
-
  <div class="listtop" width="100%">[% title %]</div>
 
  <form method="post" action="dn.pl" name="Form">
@@ -22,8 +12,9 @@
     <th class="listheading"><translate>Dunning Level</translate></th>
     <th class="listheading"><translate>Dunning Description</translate></th>
     <th class="listheading"><translate>Active?</translate></th>
-    <th class="listheading"><translate>Auto Send?</translate></th>
     <th class="listheading"><translate>eMail Send?</translate></th>
+<!--     <th class="listheading"><translate>Auto Send?</translate></th>  -->
+    <th class="listheading"><translate>Create invoice?</translate></th>
     <th class="listheading"><translate>Fristsetzung</translate></th>
     <th class="listheading"><translate>Duedate +Days</translate></th>
     <th class="listheading"><translate>Fee</translate></th>
@@ -51,7 +42,8 @@
       <input type="hidden" name="email_attachment_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_attachment) %]">
      </td>
 
-     <td><input type="checkbox" name="auto_[% DUNNING_it.count %]" value="1" [% IF row.auto %]checked[% END %]></td>
+<!--      <td><input type="checkbox" name="auto_[% DUNNING_it.count %]" value="1" [% IF row.auto %]checked[% END %]></td> -->
+     <td><input type="checkbox" name="create_invoices_for_fees_[% DUNNING_it.count %]" value="1" [% IF row.create_invoices_for_fees %]checked[% END %]></td>
      <td><input name="payment_terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.payment_terms) %]"></td>
      <td><input name="terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.terms) %]"></td>
      <td><input name="fee_[% DUNNING_it.count %]" size="5" value="[% HTML.escape(row.fee) %]"></td>
@@ -61,6 +53,7 @@
     [% IF DUNNING_it.last %][% SET rowcount = DUNNING_it.size + 1 %][% END %]
    [% END %]
 
+   [%- UNLESS rowcount %][% SET rowcount = '1' %][% END -%]
    <tr valign="top" class="listrow[% IF odd %]1[% ELSE %]0[% END %]">
     <td>
      <input type="hidden" name="dunning_level_[% rowcount %]" value="[% rowcount %]">
@@ -80,7 +73,8 @@
      <input type="hidden" name="email_attachment_[% rowcount %]">
     </td>
 
-    <td><input type="checkbox" name="auto_[% rowcount %]" value="1" checked></td>
+<!--     <td><input type="checkbox" name="auto_[% rowcount %]" value="1" checked></td> -->
+    <td><input type="checkbox" name="create_invoices_for_fees_[% rowcount %]" value="1" checked></td>
     <td><input name="payment_terms_[% rowcount %]" size="3"></td>
     <td><input name="terms_[% rowcount %]" size="3"></td>
     <td><input name="fee_[% rowcount %]" size="5"></td>
@@ -93,18 +87,15 @@
 
   <hr size="3" noshade>
 
-  <p>
-   <input type="checkbox" name="create_invoices_for_fees" id="create_invoices_for_fees"
-          [% IF create_invoices_for_fees %]checked[% END %]
-          value="1" onclick="enable_invoice_controls(this.checked);">
-   <label for="create_invoices_for_fees"><translate>Automatically create customer invoices for fees and interests</translate></label>
-  </p>
+  <p><translate>If the automatic creation of invoices for fees and
+    interest is switched on for a dunning level then the following
+    accounts will be used for the invoice.</translate></p>
 
   <table>
    <tr>
     <th align="right"><translate>Account for fees</translate></th>
     <td>
-     <select name="AR_amount_fee" [% UNLESS create_invoices_for_fees %]disabled[% END %]>
+     <select name="AR_amount_fee">
       [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_fee_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
       [% END %]
      </select>
@@ -114,7 +105,7 @@
    <tr>
     <th align="right"><translate>Account for interest</translate></th>
     <td>
-     <select name="AR_amount_interest" [% UNLESS create_invoices_for_fees %]disabled[% END %]>
+     <select name="AR_amount_interest">
       [% FOREACH row = SELECT_AR_AMOUNT %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_interest_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
       [% END %]
      </select>
@@ -124,7 +115,7 @@
    <tr>
     <th align="right"><translate>Record in</translate></th>
     <td>
-     <select name="AR" [% UNLESS create_invoices_for_fees %]disabled[% END %]>
+     <select name="AR">
       [% FOREACH row = SELECT_AR %]<option value="[% HTML.escape(row.id) %]" [% IF row.AR_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
       [% END %]
      </select>
@@ -136,9 +127,6 @@
 
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-  <input type="hidden" name="login" value="[% HTML.escape(login) %]">
-  <input type="hidden" name="password" value="[% HTML.escape(password) %]">
-
   <input class="submit" type="submit" name="action" value="<translate>Save</translate>">
 
  </form>