X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/7b8bda2cb40192d77faee5226ebeadd38ba99545..f06df9e12147430de8040996288b8cc4f092f987:/templates/webpages/ic/form_header.html

diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html
index 4beaf5ead..7490426ed 100644
--- a/templates/webpages/ic/form_header.html
+++ b/templates/webpages/ic/form_header.html
@@ -6,6 +6,8 @@
 
  <p><div class="listtop">[% title %]  [% HTML.escape(partnumber) %]  [% HTML.escape(description) %]</div></p>
 
+[% PROCESS 'common/flash.html' %]
+
  <form method="post" name="ic" action="[% script %]">
 
   <input name="id" type="hidden" value="[% HTML.escape(id) %]">
@@ -20,6 +22,7 @@
   <input name="eur" type="hidden" value="[% HTML.escape(eur) %]">
   <input name="language_values" type="hidden" value="[% HTML.escape(language_values) %]">
   <input name="original_partnumber" type="hidden" value="[% HTML.escape(original_partnumber) %]">
+  <input name="currow" type="hidden" value="[% HTML.escape(currow) %]">
 
   <ul id="maintab" class="shadetabs">
    <li class="selected"><a href="#" rel="master_data">[% 'Basic Data' | $T8 %]</a></li>
@@ -134,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>
@@ -225,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>
@@ -238,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>
@@ -256,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>
@@ -272,7 +273,6 @@
     </tr>
 
 
-    [% UNLESS is_service %]
     <tr>
      <td>
       <table>
@@ -289,7 +289,6 @@
       </table>
      </td>
     </tr>
-    [%- END %]
 
     <script type="text/javascript">
      <!-- Calendar.setup({ inputField : "priceupdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" }); //-->