X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/bb89cd364bde4dc194eefa7010880ecb046ce53a..HEAD:/templates/webpages/oe/search.html?ds=inline

diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
index e0f331010..e4b85ff09 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>
@@ -18,11 +18,11 @@
    <table>
     <tr>
      <th align="right">[% HTML.escape(vclabel) %]</th>
-     <td colspan="3">[% L.input_tag(vc, $vcdefault, style=style, class="initial_focus") %]</td>
+     <td>[% L.input_tag(vc, $vcdefault, style=style, class="initial_focus") %]</td>
     </tr>
     <tr>
      <th align="right" nowrap>[% 'Contact Person' | $T8 %]</th>
-     <td colspan="3">[% L.input_tag("cp_name", '', style=style) %]</td>
+     <td>[% L.input_tag("cp_name", '', style=style) %]</td>
     </tr>
 [%- IF ALL_DEPARTMENTS.size %]
     <tr>
@@ -32,12 +32,21 @@
 [%- END %]
     <tr>
      <th align="right">[% HTML.escape(ordlabel) %]</th>
-     <td colspan="3"><input name="[% HTML.escape(ordnrname) %]" style=style></td>
+     <td>[% L.input_tag(ordnrname, "", style=style) %]</td>
+     <th align="right">[% 'Status' | $T8 %]</th>
+     <td colspan=3>[% L.select_tag('order_status_id', ALL_ORDER_STATUSES, default = order_status_id, title_key = 'name', with_empty = 1, style=style) %]</td>
     </tr>
+
+[% IF type == "purchase_order_confirmation" %]
+    <tr>
+     <th align="right">[% LxERP.t8("Vendor Confirmation Number") %]</th>
+     <td>[% L.input_tag("vendor_confirmation_number", '', style=style) %]</td>
+    </tr>
+[% END %]
 [% IF is_order %]
     <tr>
      <th align="right">[% LxERP.t8("Customer Order Number") %]</th>
-     <td colspan="3">[% L.input_tag("cusordnumber", '', style=style) %]</td>
+     <td>[% L.input_tag("cusordnumber", '', style=style) %]</td>
     </tr>
 [% END %]
     <tr>
@@ -54,37 +63,75 @@
     </tr>
     <tr>
      <th align="right">[% 'Shipping Point' | $T8 %]</th>
-     <td colspan="3">[% L.input_tag('shippingpoint', '', style=style) %]</td>
+     <td>[% L.input_tag('shippingpoint', '', style=style) %]</td>
     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Name (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptoname", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Department 1 (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptodepartment_1", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Department 2 (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptodepartment_2", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Street (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptostreet", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Zipcode (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptozipcode", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'City (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptocity", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Country (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptocountry", "", style=style) %]</td>
+     </tr>
     <tr>
      <th align="right">[% 'Transaction description' | $T8 %]</th>
-     <td><input name="transaction_description" style=style></td>
-
+     <td>[% L.input_tag("transaction_description", "", style=style) %]</td>
      <th align="right">[% 'Part Description' | $T8 %]</th>
-     <td><input name="parts_description" style=style></td>
+     <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><input name="parts_partnumber" style=style></td>
+     <td>[% L.input_tag("parts_partnumber", "", style=style) %]</td>
     </tr>
     [%- UNLESS ALL_BUSINESS_TYPES.size == 0 %]
     <tr>
      <th align="right" nowrap>[% vctypelabel %]</th>
-     <td colspan="3">
+     <td>
       [% L.select_tag('business_id', ALL_BUSINESS_TYPES, title_key = 'description', with_empty = 1, style=style) %]
      </td>
     </tr>
     [%- END %]
     <tr>
-     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
+     <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>
+    [%- IF type == 'sales_order' %]
+    <tr>
+     <th align="right">[% 'Full Text' | $T8 %]</th>
+     <td>[% L.input_tag('fulltext', '', style=style) %]</td>
+    </tr>
+    [%- END %]
+    <tr>
+     <th align="right">[% IF type == 'purchase_order_confirmation' %][% 'Confirmation Date' | $T8 %][% ELSIF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
      <td>
        [% L.date_tag('transdatefrom') %]
-     </td>
-     <th align="right">[% 'Bis' | $T8 %]</th>
-     <td>
+       [% 'Bis' | $T8 %]
       [% L.date_tag('transdateto') %]
      </td>
     </tr>
@@ -92,9 +139,7 @@
      <th align="right">[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]</th>
      <td>
        [% L.date_tag('reqdatefrom') %]
-     </td>
-     <th align="right">[% 'Bis' | $T8 %]</th>
-     <td>
+       [% 'Bis' | $T8 %]
        [% L.date_tag('reqdateto') %]
      </td>
     </tr>
@@ -104,9 +149,7 @@
      <th align="right">[% 'Insert Date' | $T8 %] [% 'From' | $T8 %]</th>
      <td>
        [% L.date_tag('insertdatefrom') %]
-     </td>
-     <th align="right">[% 'Bis' | $T8 %]</th>
-     <td>
+       [% 'Bis' | $T8 %]
        [% L.date_tag('insertdateto') %]
      </td>
     </tr>
@@ -116,17 +159,15 @@
     <tr>
      <th align="right">[% 'Expected billing date' | $T8 %] [% 'From' | $T8 %]</th>
      <td>
-      [% L.date_tag('expected_billing_date_from', '' 'BL') %]
-     </td>
-     <th align="right">[% 'Expected billing date' | $T8 %] [% 'Bis' | $T8 %]</th>
-     <td>
-      [% L.date_tag('expected_billing_date_to', '' 'BL') %]
+      [% L.date_tag('expected_billing_date_from', '') %]
+      [% 'Bis' | $T8 %]
+      [% L.date_tag('expected_billing_date_to', '') %]
      </td>
     </tr>
     <tr>
      <th align="right">[% 'Order probability' | $T8 %]</th>
-     <td colspan="3">
-      [% L.select_tag('order_probability_op', [[ 'ge', '>=' ], [ 'le', '<=' ]]) %]
+     <td>
+      [% L.select_tag('order_probability_op', [[ 'ge', '>=' ], [ 'le', '<=' ]]) %] [%-# '> make emacs happy %]
       [% L.select_tag('order_probability_value', ORDER_PROBABILITIES, title='title', with_empty=1) %]
      </td>
     </tr>
@@ -135,7 +176,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 %]
@@ -207,11 +248,17 @@
           <label for="l_insertdate">[% 'Insert Date' | $T8 %]</label>
         </td>
         [%- END %]
+[% IF type == "purchase_order_confirmation" %]
+        <td>
+         <input name="l_vendor_confirmation_number" id="l_vendor_confirmation_number" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_vendor_confirmation_number">[% LxERP.t8("Vendor Confirmation Number") %]</label>
+        </td>
+[% END %]
        </tr>
        <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>
@@ -267,6 +314,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>
@@ -277,6 +328,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>
@@ -295,9 +350,19 @@
          <input name="l_remaining_netamount" id="l_remaining_netamount" class="checkbox" type="checkbox" value="Y">
          <label for="l_remaining_netamount">[% 'Remaining Net Amount' | $T8 %]</label>
         </td>
+        <td>
+         <input name="l_order_status" id="l_order_status" class="checkbox" type="checkbox" value="Y">
+         <label for="l_order_status">[% 'Status' | $T8 %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_items" id="l_items" class="checkbox" type="checkbox" value="Y">
+         <label for="l_items">[% 'Positions' | $T8 %]</label>
+        </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>
@@ -313,12 +378,46 @@
          <label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label>
         </td>
        </tr>
+       <tr>
+        <td colspan=4 align=left><b>[% 'Shipping Address' | $T8 %]</b></td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_shiptoname" id="l_shiptoname" type="checkbox" value="Y">
+         <label for="l_shiptoname">[% 'Name' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_shiptodepartment_1" id="l_shiptodepartment_1" type="checkbox" value="Y">
+         <label for="l_shiptodepartment_1">[% 'Department 1' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_shiptodepartment_2" id="l_shiptodepartment_2" type="checkbox" value="Y">
+         <label for="l_shiptodepartment_2">[% 'Department 2' | $T8 %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_shiptostreet" id="l_shiptostreet" type="checkbox" value="Y">
+         <label for="l_shiptostreet">[% 'Street' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_shiptozipcode" id="l_shiptozipcode" type="checkbox" value="Y">
+         <label for="l_shiptozipcode">[% 'Zipcode' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_shiptocity" id="l_shiptocity" type="checkbox" value="Y">
+         <label for="l_shiptocity">[% 'City' | $T8 %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_shiptocountry" id="l_shiptocountry" type="checkbox" value="Y">
+         <label for="l_shiptocountry">[% 'Country' | $T8 %]</label>
+        </td>
+       </tr>
 
       [% CT_CUSTOM_VARIABLES_INCLUSION_CODE %]
 
-[%- IF type == 'sales_order' %]
-       <tr><td colspan="3"><hr></td></tr>
-[%- END %]
       </table>
      </td>
     </tr>
@@ -327,9 +426,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>