Merge branch 'karushka'

[kivitendo-erp.git] / templates / webpages / oe / search_master.html

diff --git a/templates/webpages/oe/search_master.html b/templates/webpages/oe/search_master.html
index 3936328..3d69965 100644 (file)
--- 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>
@@ -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">
@@ -229,6 +241,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>