X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fct%2Fsearch.html;h=988089d9d13c470de725038571f3982f22bebe59;hb=ca863a1d92d1332c1dd3432974c4131e0e13efae;hp=57b970cbefe04809fbacebe8cb71c85fad748b3e;hpb=3aa5cee2f12c1dff757539b60196bf5e1be0a5d6;p=kivitendo-erp.git

diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
index 57b970cbe..988089d9d 100644
--- a/templates/webpages/ct/search.html
+++ b/templates/webpages/ct/search.html
@@ -3,7 +3,7 @@
 [%- USE HTML %]
 <h1>[% title %]</h1>
 
- <form method="post" action="ct.pl" name="Form">
+ <form method="post" action="ct.pl" name="Form" id="form">
 
   <input type="hidden" name="db" value="[% HTML.escape(db) %]">
 
@@ -31,14 +31,14 @@
     <th align="right" nowrap>[% 'Contact person (surname)' | $T8 %]</th>
     <td><input name="cp_name" size="35"></td>
    </tr>
-   </tr>
+   <tr>
     <th align="right" nowrap>[% 'Billing/shipping address (street)' | $T8 %]</th>
     <td><input name="addr_street" size="35"></td>
    </tr>
- <tr>
+   <tr>
     <th align="right" nowrap>[% 'Billing/shipping address (zipcode)' | $T8 %]</th>
     <td><input name="addr_zipcode" size="35"></td>
- </tr>
+   </tr>
    <tr>
     <th align="right" nowrap>[% 'Billing/shipping address (city)' | $T8 %]</th>
     <td><input name="addr_city" size="35"></td>
@@ -47,6 +47,10 @@
     <th align="right" nowrap>[% 'Billing/shipping address (country)' | $T8 %]</th>
     <td><input name="addr_country" size="35"></td>
    </tr>
+   <tr>
+    <th align="right" nowrap>[% 'Billing/shipping address (GLN)' | $T8 %]</th>
+    <td><input name="addr_gln" size="35"></td>
+   </tr>
 
    [% IF SHOW_BUSINESS_TYPES %]
    <tr>
@@ -57,6 +61,26 @@
    </tr>
    [% END %]
 
+   [% IF IS_CUSTOMER && ALL_SALESMEN.size %]
+   <tr>
+    <th align="right" nowrap>[% 'Salesman' | $T8 %]</th>
+    <td>
+     [% L.select_tag('salesman_id', ALL_SALESMEN, title_key = 'name', with_empty = 1) %]
+    </td>
+   </tr>
+   [% END %]
+
+   <tr>
+    <th align="right">[% 'Insert Date' | $T8 %] [% 'From' | $T8 %]</th>
+    <td>
+      [% L.date_tag('insertdatefrom') %]
+    </td>
+    <th align="right">[% 'Bis' | $T8 %]</th>
+    <td>
+      [% L.date_tag('insertdateto') %]
+    </td>
+   </tr>
+
    [% CUSTOM_VARIABLES_FILTER_CODE %]
 
    <tr>
@@ -77,7 +101,7 @@
 
    <tr>
     <th align="right" nowrap>[% 'Include in Report' | $T8 %]</th>
-    <td>
+    <td colspan="5">
      <table border="0">
       <tr>
        <td>
@@ -152,7 +176,7 @@
        <td>
         <input name="l_country" id="l_country" type="checkbox" class="checkbox" value="Y" checked>
         <label for="l_country">[% 'Country' | $T8 %]</label>
-      </td>
+       </td>
       </tr>
       <tr>
        <td>
@@ -163,13 +187,27 @@
         <input name="l_payment" id="l_payment" type="checkbox" class="checkbox" value="Y">
         <label for="l_payment">[% 'Payment Terms' | $T8 %]</label>
        </td>
+       <td>
+        <input name="l_insertdate" id="l_insertdate" class="checkbox" type="checkbox" value="Y">
+        <label for="l_insertdate">[% 'Insert Date' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_gln" id="l_gln" type="checkbox" class="checkbox" value="Y" checked>
+        <label for="l_gln">[% 'GLN' | $T8 %]</label>
+       </td>
+      </tr>
       [% IF IS_CUSTOMER %]
-      <td>
-       <input name="l_salesman" id="l_salesman" type="checkbox" class="checkbox" value="Y">
-       <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
-      </td>
-      [% END %]
+      <tr>
+       <td>
+        <input name="l_salesman" id="l_salesman" type="checkbox" class="checkbox" value="Y">
+        <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_pricegroup" id="l_pricegroup" type="checkbox" class="checkbox" value="Y">
+        <label for="l_pricegroup">[% 'Pricegroup' | $T8 %]</label>
+       </td>
       </tr>
+      [% END %]
 
       [% CUSTOM_VARIABLES_INCLUSION_CODE %]
 
@@ -177,8 +215,4 @@
     </td>
    </tr>
   </table>
-
-  <input type="hidden" name="nextsub" value="list_names">
-
-  <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
  </form>