X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Foe%2Fsearch.html;h=06f1429c77e23335249c8112d5afb3190f8e36f3;hb=049e49fea3e4a3c7c78d7aebf055936b3cab40c5;hp=8d76ecb5986ccab7d90deffc9e1c0eb1e2eb7738;hpb=0f0cb3b708f9078b774a07cecd996e5bdc5fac63;p=kivitendo-erp.git

diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
index 8d76ecb59..06f1429c7 100644
--- a/templates/webpages/oe/search.html
+++ b/templates/webpages/oe/search.html
@@ -2,14 +2,14 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE L %]
+<h1>[% HTML.escape(title) %]</h1>
+
 [%- SET vclabel = vc == 'customer' ? LxERP.t8('Customer') : LxERP.t8('Vendor') %]
 [%- SET vcnumberlabel = vc == 'customer' ? LxERP.t8('Customer Number') : LxERP.t8('Vendor Number') %]
 [%- SET vctypelabel = vc == 'customer' ? LxERP.t8('Customer type') : LxERP.t8('Vendor type') %]
 
 <form method="post" action="oe.pl">
 
- <p><div class="listtop">[% HTML.escape(title) %]</div></p>
-
 <table width="100%">
  <tr>
   <td>
@@ -32,6 +32,10 @@
                  -%]
      </td>
     </tr>
+    <tr>
+     <th align="right" nowrap>[% 'Contact Person' | $T8 %]</th>
+     <td colspan="3">[% L.input_tag("cp_name", '', style="width: 250px") %]</td>
+    </tr>
 [%- IF ALL_DEPARTMENTS.size %]
     <tr>
      <th align="right" nowrap>[% 'Department' | $T8 %]</th>
@@ -53,6 +57,12 @@
      <th align="right">[% HTML.escape(ordlabel) %]</th>
      <td colspan="3"><input name="[% HTML.escape(ordnrname) %]" style="width: 250px"></td>
     </tr>
+[% IF is_order %]
+    <tr>
+     <th align="right">[% LxERP.t8("Customer Order Number") %]</th>
+     <td colspan="3">[% L.input_tag("cusordnumber", '', style="width: 250px") %]</td>
+    </tr>
+[% END %]
     <tr>
      <th align="right">[% 'Employee' | $T8 %]</th>
      <td>[% L.select_tag('employee_id', ALL_EMPLOYEES, title_key='safe_name', with_empty=1, style='width:250px') %]</td>
@@ -116,6 +126,25 @@
        [% L.date_tag('reqdateto') %]
      </td>
     </tr>
+[%- IF type == 'sales_quotation' %]
+    <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') %]
+     </td>
+    </tr>
+    <tr>
+     <th align="right">[% 'Order probability' | $T8 %]</th>
+     <td colspan="3">
+      [% L.select_tag('order_probability_op', [[ 'ge', '>=' ], [ 'le', '<=' ]]) %]
+      [% L.select_tag('order_probability_value', ORDER_PROBABILITIES, title='title', with_empty=1) %]
+     </td>
+    </tr>
+[%- END %]
     <tr>
      <th align="right">[% 'Include in Report' | $T8 %]</th>
      <td colspan="5">
@@ -138,7 +167,7 @@
         </td>
         <td>
          <input name="delivered" id="delivered" class="checkbox" type="checkbox" value="1" checked>
-         <label for="delivered">[% 'Delivery Order created' | $T8 %]</label>
+         <label for="delivered">[% 'Delivery Order(s) for full qty created' | $T8 %]</label>
         </td>
        </tr>
 [%- END %]
@@ -161,6 +190,12 @@
          <input name="l_[% HTML.escape(ordnrname) %]" id="l_[% HTML.escape(ordnrname) %]" class="checkbox" type="checkbox" value="Y" checked>
          <label for="l_[% HTML.escape(ordnrname) %]">[% HTML.escape(ordlabel) %]</label>
         </td>
+[% IF is_order %]
+        <td>
+         <input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_cusordnumber">[% LxERP.t8("Customer Order Number") %]</label>
+        </td>
+[% END %]
        </tr>
        <tr>
         <td>
@@ -224,7 +259,7 @@
          <label for="l_globalprojectnumber">[% 'Project Number' | $T8 %]</label>
         </td>
         <td>
-         <input name="l_transaction_description" id="l_transaction_description" class="checkbox" type="checkbox" value="Y">
+         <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>
        </tr>
@@ -238,6 +273,24 @@
          <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
         </td>
        </tr>
+[% IF type == 'sales_quotation' %]
+       <tr>
+        <td colspan="2">
+         <input name="l_order_probability_expected_billing_date" id="l_order_probability_expected_billing_date" class="checkbox" type="checkbox" value="Y">
+         <label for="l_order_probability_expected_billing_date">[% 'Order probability & expected billing date' | $T8 %]</label>
+        </td>
+       </tr>
+[%- END %]
+       <tr>
+        <td>
+         <input name="l_remaining_amount" id="l_remaining_amount" class="checkbox" type="checkbox" value="Y">
+         <label for="l_remaining_amount">[% 'Remaining Amount' | $T8 %]</label>
+        </td>
+        <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>
+       </tr>
        <tr>
         <td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</td>
        </tr>