X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/df005c490a2d6a9b7e50ea44fc7557e39ce7d6ca..fce441db:/templates/webpages/oe/search_master.html?ds=inline

diff --git a/templates/webpages/oe/search_master.html b/templates/webpages/oe/search_master.html
index 393632833..32d766f74 100644
--- a/templates/webpages/oe/search_master.html
+++ b/templates/webpages/oe/search_master.html
@@ -59,7 +59,7 @@
                  label_sub     = 'employee_labels',
                  limit         = vclimit,
                  show_empty    = 1,
-                 allow_textbox = 1,
+                 allow_textbox = 0,
                  default       = ' ',
             -%]
      </td>
@@ -75,7 +75,7 @@
                  label_sub     = 'salesman_labels',
                  limit         = vclimit,
                  show_empty    = 1,
-                 allow_textbox = 1,
+                 allow_textbox = 0,
             -%]
      </td>
     </tr>
@@ -87,7 +87,7 @@
      <th align="right"><translate>Project Number</translate></th>
      <td colspan="3">
             [%- INCLUDE 'generic/multibox.html'
-                 name          = 'project_id',
+                 name          =  vclimit < ALL_PROJECTS.size ? 'projectnumber' : 'project_id',
                  style         = "width: 250px",
                  DATA          =  ALL_PROJECTS,
                  id_key        = 'id',
@@ -99,7 +99,7 @@
      </td>
     </tr>
     <tr>
-     <th align="right"><translate>From</translate></th>
+     <th align="right"><translate>Order Date</translate> <translate>From</translate></th>
      <td>
       <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdatefrom" id="trigger3" value="?">
@@ -110,6 +110,18 @@
       <input type="button" name="transdateto" name="transdateto" id="trigger4" value="?">
      </td>
     </tr>
+    <tr>
+     <th align="right"><translate>Delivery Date</translate> <translate>From</translate></th>
+     <td>
+      <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
+      <input type=button name=reqdatefrom id="trigger5" value=?>
+     </td>
+     <th align="right"><translate>Bis</translate></th>
+     <td>
+      <input name=reqdateto id=reqdateto size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
+      <input type=button name=reqdateto name=reqdateto id="trigger6" value=?>
+     </td>
+    </tr>
     <tr>
      <th align="right"><translate>Include in Report</translate></th>
      <td colspan="5">
@@ -214,6 +226,19 @@
          <label for="l_salesman"><translate>Salesman</translate></label>
         </td>
        </tr>
+       <tr>
+        <td colspan=4 align=left><b><translate>Customer</translate></td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
+         <label for="l_country"><translate>Country</translate></label>
+        </td>
+        <td>
+         <input name="l_ustid"  id="l_ustid" class="checkbox" type="checkbox" value="Y">
+         <label for="l_ustid"><translate>USt-IdNr.</translate></label>
+        </td>
+       </tr>
 [%- IF type == 'sales_order' %]
        <tr><td colspan="3"><hr></td></tr>
 [%- END %]
@@ -229,6 +254,8 @@
  <!--
    Calendar.setup({ inputField : "transdatefrom", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger3" });
    Calendar.setup({ inputField : "transdateto",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger4" });
+   Calendar.setup({ inputField : "reqdatefrom",   ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger5" });
+   Calendar.setup({ inputField : "reqdateto",     ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger6" });
  //-->
 </script>