X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/075bd42af8885aee3c18fe055a2c82b8b43f4cea..HEAD:/templates/webpages/dunning/add.html

diff --git a/templates/webpages/dunning/add.html b/templates/webpages/dunning/add.html
index c58651e42..8ef0fcf89 100644
--- a/templates/webpages/dunning/add.html
+++ b/templates/webpages/dunning/add.html
@@ -1,43 +1,34 @@
-[%- USE T8 %]
+[%- USE T8 %][%- USE L %]
+[% USE LxERP %]
 [% USE HTML %]<script type="text/javascript" src="js/common.js"></script>
- <div class="listtop">[% title %]</div>
+<h1>[% title %]</h1>
 
- <form method="post" name="search" action="dn.pl">
+ <form method="post" name="search" action="dn.pl" id="form">
 
   <table>
    <tr>
     <th align="right">[% 'Customer' | $T8 %]</th>
     <td colspan="3">
-     [% IF SHOW_CUSTOMER_SELECTION %]
-      <select name="customer">
-       <option></option>
-       [% FOREACH row = all_customer %]<option>[% HTML.escape(row.name) %]--[% HTML.escape(row.id) %]</option>[% END %]
-      </select>
-      [% ELSE %]
-      <input name="customer" size="35">
-     [% END %]
+      <input name="customer" size="35" class="initial_focus">
     </td>
    </tr>
 
-   [% IF SHOW_DUNNING_LEVEL_SELECTION %]
+   [% IF SHOW_DEPARTMENT_SELECTION %]
     <tr>
-     <th align="right">[% 'Next Dunning Level' | $T8 %]</th>
+     <th align="right">[% 'Department' | $T8 %]</th>
      <td colspan="3">
-      <select name="dunning_level">
-       <option></option>
-       [% FOREACH row = DUNNING %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>[% END %]
-      </select>
+     [% L.select_tag('department_id', ALL_DEPARTMENTS, title_key = 'description', with_empty = 1, style=style) %]
      </td>
     </tr>
    [% END %]
 
-   [% IF SHOW_DEPARTMENT_SELECTION %]
+   [% IF SHOW_DUNNING_LEVEL_SELECTION %]
     <tr>
-     <th align="right">[% 'Department' | $T8 %]</th>
+     <th align="right">[% 'Next Dunning Level' | $T8 %]</th>
      <td colspan="3">
-      <select name="department">
+      <select name="dunning_level">
        <option></option>
-       [% FOREACH row = all_departments %]<option>[% HTML.escape(row.description) %]--[% HTML.escape(row.id) %]</option>[% END %]
+       [% FOREACH row = DUNNING %]<option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>[% END %]
       </select>
      </td>
     </tr>
@@ -53,6 +44,16 @@
     <td colspan="3"><input name="ordnumber" size="20"></td>
    </tr>
 
+   <tr>
+    <th align="right" nowrap>[% 'Payment Term' | $T8 %]</th>
+    <td colspan="3">[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key='description', with_empty=1) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" nowrap>[% 'Type' | $T8 %]</th>
+    <th>[% L.select_tag('invoice', [ ['t', LxERP.t8('Invoice (No Dunning Fees)')], ['f', LxERP.t8('AR transactions (Dunning Fees)')], ], with_empty=1) %]
+   </tr>
+
    <tr>
     <th align="right" nowrap>[% 'Notes' | $T8 %]</th>
     <td colspan="3"><input name="notes" size="40"></td>
@@ -70,16 +71,17 @@
    </tr>
 
    <tr>
-    <th align="right" nowrap>[% 'Group Invoices' | $T8 %]</th>
-    <td><input type="checkbox" value="1" name="groupinvoices" checked></td>
+    <th align="right" nowrap><label for="groupinvoices">[% 'Group Invoices' | $T8 %]</label></th>
+    <td><input type="checkbox" value="1" id="groupinvoices" name="groupinvoices" checked></td>
    </tr>
-  </table>
-
-  <input type="hidden" name="nextsub" value="show_invoices">
-
-  <br>
-  <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
 
+   <tr>
+    <th align="right" nowrap><label for="l_include_direct_debit">[% 'Include invoices with direct debit' | $T8 %]</label></th>
+    <td><input type="checkbox" value="1" id="l_include_direct_debit" name="l_include_direct_debit"></td>
+   </tr>
+   <tr>
+    <th align="right" nowrap><label for="l_include_credit_notes">[% 'Add open Credit Notes' | $T8 %]</label></th>
+    <td><input type="checkbox" value="1" id="l_include_credit_notes" name="l_include_credit_notes"></td>
+   </tr>
+  </table>
  </form>
-
-