date error in mapping

[mfinanz.git] / templates / webpages / oe / search.html

diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
index 9453f6b49fb67cd8da9077166fb0b4878ebbc605..e4b85ff095cf35940256923904caba940c98bbd9 100644 (file)
--- a/templates/webpages/oe/search.html
+++ b/templates/webpages/oe/search.html
@@ -33,7 +33,16 @@
     <tr>
      <th align="right">[% HTML.escape(ordlabel) %]</th>
      <td>[% L.input_tag(ordnrname, "", style=style) %]</td>
     <tr>
      <th align="right">[% HTML.escape(ordlabel) %]</th>
      <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>
     </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>
 [% IF is_order %]
     <tr>
      <th align="right">[% LxERP.t8("Customer Order Number") %]</th>


@@ -56,6 +65,34 @@
      <th align="right">[% 'Shipping Point' | $T8 %]</th>
      <td>[% L.input_tag('shippingpoint', '', style=style) %]</td>
     </tr>
      <th align="right">[% 'Shipping Point' | $T8 %]</th>
      <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>[% L.input_tag("transaction_description", "", style=style) %]</td>
     <tr>
      <th align="right">[% 'Transaction description' | $T8 %]</th>
      <td>[% L.input_tag("transaction_description", "", style=style) %]</td>


@@ -84,8 +121,14 @@
      <th align="right">[% 'Phone Notes' | $T8 %]</th>
      <td>[% L.input_tag('phone_notes', '', style=style) %]</td>
     </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>
     <tr>

-     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
+     <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') %]
        [% 'Bis' | $T8 %]
      <td>
        [% L.date_tag('transdatefrom') %]
        [% 'Bis' | $T8 %]


@@ -124,7 +167,7 @@
     <tr>
      <th align="right">[% 'Order probability' | $T8 %]</th>
      <td>
     <tr>
      <th align="right">[% 'Order probability' | $T8 %]</th>
      <td>

-      [% L.select_tag('order_probability_op', [[ 'ge', '>=' ], [ 'le', '<=' ]]) %]
+      [% 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>
       [% L.select_tag('order_probability_value', ORDER_PROBABILITIES, title='title', with_empty=1) %]
      </td>
     </tr>


@@ -205,6 +248,12 @@
           <label for="l_insertdate">[% 'Insert Date' | $T8 %]</label>
         </td>
         [%- END %]
           <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>
        </tr>
        <tr>
         <td>


@@ -301,6 +350,16 @@
          <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>
          <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) %]</b></td>
        </tr>
        <tr>
         <td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</b></td>


@@ -319,6 +378,43 @@
          <label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label>
         </td>
        </tr>
          <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 %]
 
 
       [% CT_CUSTOM_VARIABLES_INCLUSION_CODE %]