X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fic%2Fform_header_master.html;h=8635b416845352402aadab0336f05ca255606260;hb=b65cc47a206d0b5df78123d9b36c1867928bf684;hp=113099b378c9ddfb965a8dbbeda5c0df83b3faff;hpb=04e9a4746bd5f1de726ee00593286cbe48684417;p=kivitendo-erp.git

diff --git a/templates/webpages/ic/form_header_master.html b/templates/webpages/ic/form_header_master.html
index 113099b37..8635b4168 100644
--- a/templates/webpages/ic/form_header_master.html
+++ b/templates/webpages/ic/form_header_master.html
@@ -5,6 +5,8 @@
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/parts_language_selection.js"></script>
 
+ <p><div class="listtop">[% title %]</div></p>
+
  <form method="post" name="ic" action="[% script %]">
 
   <input name="id" type="hidden" value="[% HTML.escape(id) %]">
@@ -20,9 +22,16 @@
   <input name="language_values" type="hidden" value="[% HTML.escape(language_values) %]">
   <input name="original_partnumber" type="hidden" value="[% HTML.escape(original_partnumber) %]">
 
-  <div class="listtop">[% title %]</div>
+  <ul id="maintab" class="shadetabs">
+   <li class="selected"><a href="#" rel="master_data"><translate>Master Data</translate></a></li>
+   [%- IF CUSTOM_VARIABLES.size %]
+   <li><a href="#" rel="custom_variables"><translate>Custom Variables</translate></a></li>
+   [%- END %]
+  </ul>
+
+  <div class="tabcontentstyle">
+  <div id="master_data" class="tabcontent">
 
-  <p>
    <table width="100%">
     <tr>
      <td>
@@ -56,7 +65,7 @@
               <th align="right"><translate>Group</translate></th>
               <td>
                [%- INCLUDE generic/multibox.html
-                     name       = 'selectpartsgroup',
+                     name       = 'partsgroup',
                      DATA       = all_partsgroup,
                      show_empty = 1,
                      id_sub     = 'pg_keys',
@@ -131,7 +140,7 @@
               <td>
                <ilayer>
                 <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('<translate>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></translate>')">
-                 <textarea name="formel" rows="4" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
+                 <textarea name="formel" rows="[% HTML.escape(notes_rows) %]" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
                </td>
               [%- END %]
              </tr>
@@ -146,25 +155,24 @@
           <tr>
            <th align="right" nowrap="true"><translate>Updated</translate></th>
            <td>
-            <input name="priceupdate" id="priceupdate" size="11"  title="[% HTML.escape(dateformat) %]" value="[% HTML.escape(priceupdate) %]">
-            <input type="button" name="priceupdate" id="trigger1" value="?">
+            <input name="priceupdate" id="priceupdate" size="11"  title="[% HTML.escape(dateformat) %]" value="[% HTML.escape(priceupdate) %]" readonly>
            </td>
           </tr>
 
           <tr>
            <th align="right" nowrap="true"><translate>List Price</translate></th>
-           <td><input name="listprice" size="11" value="[% LxERP.format_amount(listprice) %]"></td>
+           <td><input name="listprice" size="11" value="[% LxERP.format_amount(listprice, -2) %]"></td>
           </tr>
 
           <tr>
            <th align="right" nowrap="true"><translate>Sell Price</translate></th>
-           <td><input name="sellprice" size="11" value="[% LxERP.format_amount(sellprice) %]"></td>
+           <td><input name="sellprice" size="11" value="[% LxERP.format_amount(sellprice, -2) %]"></td>
           </tr>
 
           [%- UNLESS is_assembly %]
           <tr>
            <th align="right" nowrap="true"><translate>Last Cost</translate></th>
-           <td><input name="lastcost" size="11" value="[% LxERP.format_amount(lastcost) %]"></td>
+           <td><input name="lastcost" size="11" value="[% LxERP.format_amount(lastcost, -2) %]"></td>
           </tr>
           [%- END %]
 
@@ -173,11 +181,12 @@
            <th align="right"><translate>Price Factor</translate></th>
            <td>
             [%- INCLUDE generic/multibox.html
-                  name       = 'price_factors_id',
+                  name       = 'price_factor_id',
                   DATA       = ALL_PRICE_FACTORS,
                   show_empty = 1,
                   id_key     = 'id',
                   label_key  = 'description',
+                  style      = 'width:100px'
             -%]
            </td>
           </tr>
@@ -195,6 +204,7 @@
                   DATA       = ALL_UNITS,
                   id_key     = 'name',
                   label_key  = 'name',
+                  style      = 'width:100px'
             -%]
             [%- END %]
            </td>
@@ -206,6 +216,7 @@
            <td>
             [%- IF is_assembly %]&nbsp;[% LxERP.format_amount(weight) %][%- END %]
             <input[% IF is_assembly %] type="hidden"[% END %] size="10" name="weight" value="[% LxERP.format_amount(weight) %]">
+            [% HTML.escape(defaults.weightunit) %]
            </td>
           </tr>
         [%- END %]
@@ -214,12 +225,6 @@
            <th align="right" nowrap><translate>On Hand</translate></th>
            <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
           </tr>
-          [%- IF is_assembly %]
-          <tr>
-           <th align="right" nowrap><translate>Stock</translate></th>
-           <td><input name="stock" size="10" value="[% LxERP.format_amount(stock) %]"></td>
-          </tr>
-          [%- END %]
           <tr>
            <th align="right" nowrap="true"><translate>ROP</translate></th>
            <td><input name="rop" size="10" value="[% LxERP.format_amount(rop) %]"></td>
@@ -247,6 +252,10 @@
            <td><input name="obsolete" id="obsolete" type="checkbox" class="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
           </tr>
         [%- END %]
+          <tr>
+           <th align="right" nowrap><label for="shop"><translate>Has serial number</translate></label></th>
+           <td><input class="checkbox" type="checkbox" name="has_sernumber" id="has_sernumber" value="1" [% IF has_sernumber %]checked[% END %]></td>
+          </tr>
           <tr>
            <th align="right" nowrap><label for="shop"><translate>Shopartikel</translate></label></th>
            <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>