Merge branch 'auftrag-loeschen-und-wiedervorlagen-2310'

[kivitendo-erp.git] / templates / webpages / ic / form_header.html

diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html
index 1d0edfb..0088919 100644 (file)
--- 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>
@@ -223,6 +222,7 @@
             [% 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>
@@ -232,10 +232,19 @@
            <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>
-        [%- END %]
           <tr>
            <th align="right" nowrap="true">[% 'Verrechnungseinheit' | $T8 %]</th>
            <td><input name="ve" size="10" value="[% HTML.escape(ve) %]"></td>
@@ -288,7 +297,3 @@
       </table>
      </td>
     </tr>
-
-    <script type="text/javascript">
-     <!-- Calendar.setup({ inputField : "priceupdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" }); //-->
-    </script>