X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fic%2Fform_header.html;h=00889195da4d56112f819ba332056489a75ea63e;hb=e6de5d289ce87cf3a44511e1fc6313ea86d0f5e7;hp=01185cc2bd094cc541682afd96ccdc16f2031b8c;hpb=81fed28305f28aff317639f9a190cdf83a678ed4;p=kivitendo-erp.git

diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html
index 01185cc2b..00889195d 100644
--- a/templates/webpages/ic/form_header.html
+++ b/templates/webpages/ic/form_header.html
@@ -1,9 +1,7 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/parts_language_selection.js"></script>
-
+[% PROCESS 'common/select_warehouse_bin.html' %]
  <p><div class="listtop">[% title %]  [% HTML.escape(partnumber) %]  [% HTML.escape(description) %]</div></p>
 
 [% PROCESS 'common/flash.html' %]
@@ -22,19 +20,20 @@
   <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>
-   [%- IF id %]
-   <li><a href="#" rel="sales_price_information">[% 'Price information' | $T8 %]</a></li>
-   [%- END %]
-   [%- IF CUSTOM_VARIABLES.size %]
-   <li><a href="#" rel="custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
-   [%- END %]
-  </ul>
+  <div class="tabwidget">
+   <ul>
+    <li><a href="#master_data">[% 'Basic Data' | $T8 %]</a></li>
+    [%- IF id %]
+    <li><a href="#sales_price_information">[% 'Price information' | $T8 %]</a></li>
+    [%- END %]
+    [%- IF CUSTOM_VARIABLES.size %]
+    <li><a href="#custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
+    [%- END %]
+   </ul>
 
-  <div class="tabcontentstyle">
-  <div id="master_data" class="tabcontent">
+  <div id="master_data">
 
    <table width="100%">
     <tr>
@@ -42,8 +41,8 @@
       <table width="100%">
        <tr valign="top">
         <td>
-[%- IF image && conf_parts_show_image %]
-         <a href="[% image | html %]" target="_blank"><img style="[% conf_parts_image_css %]" src="[% image | html %]"/></a>
+[%- IF image && INSTANCE_CONF.get_parts_show_image %]
+         <a href="[% image | html %]" target="_blank"><img style="[% INSTANCE_CONF.get_parts_image_css %]" src="[% image | html %]"/></a>
 [%- END %]
 
          <table>
@@ -52,7 +51,7 @@
             <table>
              <tr>
               <th align="right">[% 'Part Number' | $T8 %]</th>
-              <td><input id='partnumber' name="partnumber" value="[% HTML.escape(partnumber) %]" size="40"></td>
+              <td><input id='partnumber' name="partnumber" value="[% HTML.escape(partnumber) %]" size="40" class="initial_focus"></td>
              </tr>
              <tr>
               <th align="right">[% 'Part Description' | $T8 %]</th>
@@ -136,21 +135,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>
@@ -237,8 +232,18 @@
            <td><input name="rop" size="10" value="[% LxERP.format_amount(rop) %]"></td>
           </tr>
           <tr>
-           <th align="right" nowrap="true">[% 'Bin' | $T8 %]</th>
-           <td><input name="bin" size="10" value="[% HTML.escape(bin) %]"></td>
+           <th align="right" nowrap="true">[% 'Default Warehouse' | $T8 %]</th>
+           <td>
+            <select name="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)">
+             [%- FOREACH warehouse = WAREHOUSES %]
+               <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
+             [%- END %]
+            </select>
+          </td>
+          </tr>
+          <tr>
+           <th align="right" nowrap="true">[% 'Default Bin' | $T8 %]</th>
+           <td><select id="bin_id" name="bin_id"></select></td>
           </tr>
           <tr>
            <th align="right" nowrap="true">[% 'Verrechnungseinheit' | $T8 %]</th>
@@ -258,10 +263,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>
@@ -274,7 +281,6 @@
     </tr>
 
 
-    [% UNLESS is_service %]
     <tr>
      <td>
       <table>
@@ -291,8 +297,3 @@
       </table>
      </td>
     </tr>
-    [%- END %]
-
-    <script type="text/javascript">
-     <!-- Calendar.setup({ inputField : "priceupdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" }); //-->
-    </script>