Merge branch 'master', remote branch 'origin'

[kivitendo-erp.git] / templates / webpages / ic / search.html
diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html

index 4d32924..8379e15 100644 (file)
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -1,7 +1,7 @@
  [%- USE T8 %]
  [%- USE HTML %]
  [%- USE LxERP %]
-<body>
+[%- USE L %]
  
   <form method="post" action="ic.pl">
  
@@ -85,10 +85,12 @@
          <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
          <label for="itemstatus_active">[% 'Active' | $T8 %]</label>
          <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
+      [%- UNLESS is_service %]
          <label for="itemstatus_onhand">[% 'On Hand' | $T8 %]</label>
          <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
          <label for="itemstatus_short">[% 'Short' | $T8 %]</label>
          <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
+      [%- END %]
          <label for="itemstatus_obsolete">[% 'Obsolete' | $T8 %]</label>
          <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
          <label for="itemstatus_orphaned">[% 'Orphaned' | $T8 %]</label>
@@ -147,11 +149,9 @@
             <table>
              <tr>
               <th>[% 'From' | $T8 %]</th>
-             <td><input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdatefrom" id="trigger1" value="[% 'button' | $T8 %]"></td>
+             <td>[% L.date_tag('transdatefrom') %]</td>
               <th>[% 'To (time)' | $T8 %]</th>
-             <td><input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]"></td>
-             <td><input type="button" name="transdateto" name="transdateto" id="trigger2" value="[% 'button' | $T8 %]"></td>
+             <td>[% L.date_tag('transdateto') %]</td>
              </tr>
             </table>
            </td>
@@ -179,10 +179,12 @@
             <input name="l_description" id="l_description" class="checkbox" type="checkbox" value="Y" checked>
             <label for="l_description">[% 'Part Description' | $T8 %]</label>
            </td>
+      [%- UNLESS is_service %]
            <td>
             <input name="l_serialnumber" id="l_serialnumber" class="checkbox" type="checkbox" value="Y">
             <label for="l_serialnumber">[% 'Serial Number' | $T8 %]</label>
            </td>
+      [%- END %]
            <td>
             <input name="l_unit" id="l_unit" class="checkbox" type="checkbox" value="Y" checked>
             <label for="l_unit">[% 'Unit of measure' | $T8 %]</label>
@@ -220,6 +222,7 @@
             <input name="l_deliverydate" id="l_deliverydate" class="checkbox" type="checkbox" value="Y">
             <label for="l_deliverydate">[% 'deliverydate' | $T8 %]</label>
            </td>
+      [%- UNLESS is_service %]
            <td>
             <input name="l_rop" id="l_rop" class="checkbox" type="checkbox" value="Y">
             <label for="l_rop">[% 'ROP' | $T8 %]</label>
@@ -228,6 +231,7 @@
             <input name="l_weight" id="l_weight" class="checkbox" type="checkbox" value="Y">
             <label for="l_weight">[% 'Weight' | $T8 %]</label>
            </td>
+      [%- END %]
           </tr>
  
           <tr>
@@ -269,10 +273,12 @@
           </tr>
  
           <tr>
+      [%- UNLESS is_service %]
            <td>
             <input name="l_onhand" id="l_onhand" class="checkbox" type="checkbox" value="Y">
             <label for="l_onhand">[% 'Stocked Qty' | $T8 %]</label>
            </td>
+      [%- END %]
            <td>
             <input name="l_projectnumber" id="l_projectnumber" class="checkbox" type="checkbox" value="Y">
             <label for="l_projectnumber">[% 'Project Number' | $T8 %]</label>
@@ -287,6 +293,13 @@
            </td>
           </tr>
  
+         <tr>
+          <td>
+           <input name="l_notes" id="l_notes" class="checkbox" type="checkbox" value="Y">
+           <label for="l_notes">[% 'Notes' | $T8 %]</label>
+          </td>
+         </tr>
+
           [% CUSTOM_VARIABLES_INCLUSION_CODE %]
          </table>
         </td>
@@ -297,18 +310,8 @@
     <tr><td colspan="4"><hr size="3" noshade></td></tr>
    </table>
  
-  <script type="text/javascript">
-   <!--
-       Calendar.setup({ inputField : "transdatefrom",  ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
-       Calendar.setup({ inputField : "transdateto",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
-       //-->
-  </script>
-
    <p>
     <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
     <input class="submit" type="submit" name="action" value="[% 'TOP100' | $T8 %]">
    </p>
   </form>
-
-</body>
-</html>