Merge branch 'bankerweiterung_und_skonto'

[kivitendo-erp.git] / templates / webpages / do / search.html

diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html
index 905215c..baa00bb 100644 (file)
--- a/templates/webpages/do/search.html
+++ b/templates/webpages/do/search.html
@@ -1,12 +1,16 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %][%- USE LxERP %]
+<h1>[% title %]</h1>
+
  [%- IF vc == 'customer' %]
  [%- SET is_customer = '1' %]
  [%- ELSE %]
  [%- SET is_customer = '0' %]
  [%- END %]
 
+ [%- SET vctypelabel = vc == 'customer' ? LxERP.t8('Customer type') : LxERP.t8('Vendor type') %]
+
  <script type="text/javascript">
    $(function(){ document.Form.donumber.focus(); });
  </script>
@@ -19,8 +23,6 @@
 
  <form method="post" action="do.pl" name="Form">
 
-  <div class="listtop">[% title %]</div>
-
   <p>
    <table>
     <tr>
@@ -40,6 +42,11 @@
      </td>
     </tr>
 
+    <tr>
+     <th align="right" nowrap>[% 'Contact Person' | $T8 %]</th>
+     <td colspan="3">[% L.input_tag("cp_name", '', class="fixed_width") %]</td>
+    </tr>
+
     <tr>
      <th align="right">[% 'Delivery Order Number' | $T8 %]</th>
      <td colspan="3"><input name="donumber" class="fixed_width"></td>
@@ -103,6 +110,15 @@
      <td colspan="3"><input name="serialnumber" class="fixed_width"></td>
     </tr>
 
+    [%- IF ALL_BUSINESS_TYPES.size %]
+    <tr>
+     <th align="right" nowrap>[% vctypelabel %]</th>
+     <td colspan="3">
+      [% L.select_tag('business_id', ALL_BUSINESS_TYPES, title_key = 'description', with_empty = 1, style='width:250px') %]
+     </td>
+    </tr>
+    [%- END %]
+
     <tr>
      <th align="right">[% 'Delivery Order Date' | $T8 %] [% 'From' | $T8 %]</th>
      <td>
@@ -125,6 +141,19 @@
      </td>
     </tr>
 
+    [%- IF is_customer %]
+    <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>
+    [%- END %]
+
     <tr>
      <th align="right">[% 'Include in Report' | $T8 %]</th>
      <td colspan="5">
@@ -183,6 +212,12 @@
          <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
          <label for="l_reqdate">[% 'Reqdate' | $T8 %]</label>
         </td>
+        [% IF is_customer %]
+        <td>
+         <input name="l_insertdate" id="l_insertdate" class="checkbox" type="checkbox" value="Y">
+         <label for="l_insertdate">[% 'Insert Date' | $T8 %]</label>
+        </td>
+        [%- END %]
        </tr>
 
        <tr>