X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/3aa5cee2f12c1dff757539b60196bf5e1be0a5d6..2d0387d1624b5b7ed6b13b79b9d5a87ce9b6d12b:/templates/webpages/gl/search.html

diff --git a/templates/webpages/gl/search.html b/templates/webpages/gl/search.html
index e9ec7970c..da3cb7b22 100644
--- a/templates/webpages/gl/search.html
+++ b/templates/webpages/gl/search.html
@@ -4,7 +4,7 @@
 [%- USE L %]
 <h1>[% 'Journal' | $T8 %]</h1>
 
-<form method=post action=gl.pl>
+<form method=post id="form" action=gl.pl>
 
 <input type=hidden name=sort value=datesort>
 
@@ -18,10 +18,10 @@
           <th align=right>[% 'Source' | $T8 %]</th>
           <td><input name=source size=20></td>
         </tr>
-        [%- IF all_departments %]
+        [%- IF ALL_DEPARTMENTS %]
         <tr>
           <th align=right nowrap>[% 'Department' | $T8 %]</th>
-          <td colspan=3>[% L.select_tag('department', all_departments, value_title_sub = \department_label, with_empty = 1) %]</td>
+          <td colspan=3>[% L.select_tag('department_id', ALL_DEPARTMENTS, title_key = 'description', with_empty = 1) %]</td>
         </tr>
         [%- END %]
         <tr>
@@ -45,8 +45,8 @@
   <tr>
     <th align=right>[% 'Filter date by' | $T8 %]</th>
     <td colspan=3>
-    <input name=datesort class=radio type=radio value=gldate checked> [% 'Booking Date' | $T8 %]
-    <input name=datesort class=radio type=radio value=transdate> [% 'Invoice Date' | $T8 %]
+    <input name=datesort class=radio type=radio value=transdate checked> [% 'Transdate' | $T8 %]
+    <input name=datesort class=radio type=radio value=gldate> [% 'Gldate' | $T8 %]
   </td>
   </tr>
   <tr>
@@ -74,9 +74,9 @@
                     <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
                     <td>[% 'ID' | $T8 %]</td>
                     <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-                    <td>[% 'Invoice Date' | $T8 %]</td>
+                    <td>[% 'Transdate' | $T8 %]</td>
                     <td align=right><input name="l_gldate" class=checkbox type=checkbox value=Y checked></td>
-                    <td>[% 'Booking Date' | $T8 %]</td>
+                    <td>[% 'Gldate' | $T8 %]</td>
                     <td align=right><input name="l_reference" class=checkbox type=checkbox value=Y checked></td>
                     <td>[% 'Reference' | $T8 %]</td>
                     <td align=right><input name="l_description" class=checkbox type=checkbox value=Y checked></td>
@@ -93,15 +93,21 @@
                     <td>[% 'Source' | $T8 %]</td>
                     <td align=right><input name="l_accno" class=checkbox type=checkbox value=Y checked></td>
                     <td>[% 'Account' | $T8 %]</td>
+                    [%- IF ALL_DEPARTMENTS %]
+                      <td align=right><input name="l_department" class=checkbox type=checkbox value=Y></td>
+                      <td>[% 'Department' | $T8 %]</td>
+                    [%- END %]
                   </tr>
                   <tr>
-                    <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-                    <td>[% 'Subtotal' | $T8 %]</td>
                     <td align=right><input name="l_projectnumbers" class=checkbox type=checkbox value=Y></td>
                     <td>[% 'Project Number' | $T8 %]</td>
                     <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
                     <td>[% 'Employee' | $T8 %]</td>
                   </tr>
+                  <tr>
+                    <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
+                    <td>[% 'Subtotal' | $T8 %]</td>
+                  </tr>
                 </table>
               </tr>
             </table>
@@ -109,13 +115,5 @@
       </table>
     </td>
   </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
 </table>
-
-<input type=hidden name=nextsub value=generate_report>
-
-<br>
-<input class=submit type=submit name=action value="[% 'Continue' | $T8 %]">
 </form>