X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Foe%2Fsearch.html;h=9453f6b49fb67cd8da9077166fb0b4878ebbc605;hb=2d51ec2e72f4b8cc59be91ee77e6568758f28ee9;hp=fe1df7ef15f57f25aea951c58c9229c64e150c5e;hpb=aa63ebae1c0a758ec438c594acb328b1f0e5e001;p=kivitendo-erp.git

diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
index fe1df7ef1..9453f6b49 100644
--- a/templates/webpages/oe/search.html
+++ b/templates/webpages/oe/search.html
@@ -10,7 +10,7 @@
 [%- SET vcdefault = 'old' _ vc %]
 [%- SET style="width: 250px" %]
 
-<form method="post" action="oe.pl">
+<form method="post" action="oe.pl" id="form">
 
 <table width="100%">
  <tr>
@@ -59,14 +59,12 @@
     <tr>
      <th align="right">[% 'Transaction description' | $T8 %]</th>
      <td>[% L.input_tag("transaction_description", "", style=style) %]</td>
-
      <th align="right">[% 'Part Description' | $T8 %]</th>
      <td>[% L.input_tag("parts_description", "", style=style) %]</td>
     </tr>
     <tr>
      <th align="right">[% 'Project' | $T8 %]</th>
-     <td>[% P.project_picker("project_id", '', style=style) %]</td>
-
+     <td>[% P.project.picker("project_id", '', active="both", valid="both", style=style) %]</td>
      <th align="right">[% 'Part Number' | $T8 %]</th>
      <td>[% L.input_tag("parts_partnumber", "", style=style) %]</td>
     </tr>
@@ -78,6 +76,14 @@
      </td>
     </tr>
     [%- END %]
+    <tr>
+     <th align="right">[% 'Internal Notes' | $T8 %]</th>
+     <td>[% L.input_tag('intnotes', '', style=style) %]</td>
+    </tr>
+    <tr>
+     <th align="right">[% 'Phone Notes' | $T8 %]</th>
+     <td>[% L.input_tag('phone_notes', '', style=style) %]</td>
+    </tr>
     <tr>
      <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
      <td>
@@ -110,9 +116,9 @@
     <tr>
      <th align="right">[% 'Expected billing date' | $T8 %] [% 'From' | $T8 %]</th>
      <td>
-      [% L.date_tag('expected_billing_date_from', '' 'BL') %]
+      [% L.date_tag('expected_billing_date_from', '') %]
       [% 'Bis' | $T8 %]
-      [% L.date_tag('expected_billing_date_to', '' 'BL') %]
+      [% L.date_tag('expected_billing_date_to', '') %]
      </td>
     </tr>
     <tr>
@@ -127,7 +133,7 @@
 [%- IF CT_CUSTOM_VARIABLES.size %]
     <tr>
       <td></td>
-      <td colspan=4 align=left><b>[% 'Custom variables for module' | $T8 %]: [%'Customers and vendors' | $T8 %]</td>
+      <td colspan=4 align=left><b>[% 'Custom variables for module' | $T8 %]: [%'Customers and vendors' | $T8 %]</b></td>
     </tr>
     [% CT_CUSTOM_VARIABLES_FILTER_CODE %]
 [%- END %]
@@ -203,7 +209,7 @@
        <tr>
         <td>
          <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_name">[% HTML.escape(vclabel) %]
+         <label for="l_name">[% HTML.escape(vclabel) %]</label>
         </td>
         <td>
          <input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y" checked>
@@ -259,6 +265,10 @@
          <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y"[% IF INSTANCE_CONF.get_require_transaction_description_ps %] checked[% END %]>
          <label for="l_transaction_description">[% 'Transaction description' | $T8 %]</label>
         </td>
+        <td>
+         [%- L.checkbox_tag('l_department', label => LxERP.t8('Department')) %]
+        </td>
+
        </tr>
        <tr>
         <td>
@@ -269,6 +279,10 @@
          <input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y">
          <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
         </td>
+        <td>
+         <input name="l_intnotes" id="l_intnotes" class="checkbox" type="checkbox" value="Y">
+         <label for="l_intnotes">[% 'Internal Notes' | $T8 %]</label>
+        </td>
        </tr>
 [% IF type == 'sales_quotation' %]
        <tr>
@@ -289,7 +303,7 @@
         </td>
        </tr>
        <tr>
-        <td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</td>
+        <td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</b></td>
        </tr>
        <tr>
         <td>
@@ -316,9 +330,7 @@
  </tr>
 </table>
 
-<br>
-<input type="hidden" name="nextsub" value="orders">
 <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
 <input type="hidden" name="type" value="[% HTML.escape(type) %]">
-<input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+<input type="hidden" name="action" value="orders">
 </form>