X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fct%2Fsearch.html;h=10a6ceaaebaa23c9d23c916912cc5f8d8c35a004;hb=061f4d6d32ed95055114582ede45e8387b302a53;hp=2d78134fe9562a8a594b53199fb5eb8053228b84;hpb=8d771986641efbc83911b0ba007e6c240daea550;p=kivitendo-erp.git

diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
index 2d78134fe..10a6ceaae 100644
--- a/templates/webpages/ct/search.html
+++ b/templates/webpages/ct/search.html
@@ -1,12 +1,12 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
+
  <form method="post" action="ct.pl" name="Form">
 
   <input type="hidden" name="db" value="[% HTML.escape(db) %]">
 
-  <div class="listtop">[% title %]</div>
-
   <table>
    <tr>
     <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %]</th>
@@ -15,7 +15,7 @@
 
    <tr>
     <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]</th>
-    <td><input id="name" name="name" size="35"></td>
+    <td><input id="name" name="name" size="35" class="initial_focus"></td>
    </tr>
 
    <tr>
@@ -35,14 +35,23 @@
     <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>
    </tr>
+   <tr>
+    <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>
     <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</th>
@@ -52,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>
@@ -72,7 +101,7 @@
 
    <tr>
     <th align="right" nowrap>[% 'Include in Report' | $T8 %]</th>
-    <td>
+    <td colspan="5">
      <table border="0">
       <tr>
        <td>
@@ -128,7 +157,7 @@
        <td>
         <input name="l_city" id="l_city" type="checkbox" class="checkbox" value="Y" checked>
         <label for="l_city">[% 'City' | $T8 %]</label>
-      </td>
+       </td>
       </tr>
 
       <tr>
@@ -145,8 +174,40 @@
         <label for="l_quonumber">[% IF IS_CUSTOMER %][% 'Quotations' | $T8 %][% ELSE %][% 'RFQs' | $T8 %][% END %]</label>
        </td>
        <td>
+        <input name="l_country" id="l_country" type="checkbox" class="checkbox" value="Y" checked>
+        <label for="l_country">[% 'Country' | $T8 %]</label>
+       </td>
+      </tr>
+      <tr>
+       <td>
+        <input name="l_discount" id="l_discount" type="checkbox" class="checkbox" value="Y">
+        <label for="l_discount">[% 'Discount' | $T8 %]</label>
+       </td>
+       <td>
+        <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 %]
+      <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 %]
 
@@ -159,4 +220,3 @@
 
   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
  </form>
-