From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 12 Nov 2012 07:31:40 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~8
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/f06df9e12147430de8040996288b8cc4f092f987?hp=43b585927cf026686116dc6d1d68ca13e1ee02aa

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html
index f31116182..7490426ed 100644
--- a/templates/webpages/ic/form_header.html
+++ b/templates/webpages/ic/form_header.html
@@ -137,21 +137,17 @@
             <table>
              <tr>
               <th align="left">[% 'Part Notes' | $T8 %]</th>
-              [%- UNLESS is_service %]
               <th align="left">[% 'Formula' | $T8 %]</th>
-              [%- END %]
              </tr>
              <tr>
               <td>
                <textarea name="notes" rows="[% HTML.escape(notes_rows) %]" cols="45" wrap="soft">[% HTML.escape(notes) %]</textarea>
               </td>
-              [%- UNLESS is_service %]
               <td>
                <ilayer>
                 <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('[% 'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' | $T8 %]')">
                  <textarea name="formel" rows="[% HTML.escape(notes_rows) %]" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
                </td>
-              [%- END %]
              </tr>
             </table>
            </td>
@@ -228,7 +224,6 @@
             [% HTML.escape(defaults.weightunit) %]
            </td>
           </tr>
-        [%- END %]
           <tr>
            <th align="right" nowrap>[% 'On Hand' | $T8 %]</th>
            <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
@@ -241,6 +236,7 @@
            <th align="right" nowrap="true">[% 'Bin' | $T8 %]</th>
            <td><input name="bin" size="10" value="[% HTML.escape(bin) %]"></td>
           </tr>
+        [%- END %]
           <tr>
            <th align="right" nowrap="true">[% 'Verrechnungseinheit' | $T8 %]</th>
            <td><input name="ve" size="10" value="[% HTML.escape(ve) %]"></td>
@@ -259,10 +255,12 @@
            <td><input name="obsolete" id="obsolete" type="checkbox" class="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
           </tr>
         [%- END %]
+        [%- UNLESS is_service %]
           <tr>
            <th align="right" nowrap><label for="has_sernumber">[% 'Has serial number' | $T8 %]</label></th>
            <td><input class="checkbox" type="checkbox" name="has_sernumber" id="has_sernumber" value="1" [% IF has_sernumber %]checked[% END %]></td>
           </tr>
+        [%- END %]
           <tr>
            <th align="right" nowrap><label for="shop">[% 'Shopartikel' | $T8 %]</label></th>
            <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>
@@ -275,7 +273,6 @@
     </tr>
 
 
-    [% UNLESS is_service %]
     <tr>
      <td>
       <table>
@@ -292,7 +289,6 @@
       </table>
      </td>
     </tr>
-    [%- END %]
 
     <script type="text/javascript">
      <!-- Calendar.setup({ inputField : "priceupdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" }); //-->
diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index ffdf29bc2..8379e15a6 100644
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -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>
@@ -177,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>
@@ -218,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>
@@ -226,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>
@@ -267,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>
@@ -307,4 +315,3 @@
    <input class="submit" type="submit" name="action" value="[% 'TOP100' | $T8 %]">
   </p>
  </form>
-