X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/f23dd0afa9faf6243ce432cc47cc0140af5c27c2..HEAD:/templates/webpages/inventory/warehouse_selection_stock.html

diff --git a/templates/webpages/inventory/warehouse_selection_stock.html b/templates/webpages/inventory/warehouse_selection_stock.html
index 5901f6deb..d0fa5cb3e 100644
--- a/templates/webpages/inventory/warehouse_selection_stock.html
+++ b/templates/webpages/inventory/warehouse_selection_stock.html
@@ -1,25 +1,26 @@
 [%- USE T8 %]
 [%- USE L %]
+[%- USE P %]
 [%- USE HTML %]
 [%- USE LxERP %]
 
 <h1>[% title | html %]</h1>
 
-[%- PROCESS 'common/flash.html' %]
+[%- INCLUDE 'common/flash.html' %]
 
-<form name="Form" method="post" action="controller.pl">
+<form name="Form" method="post" action="controller.pl" id="form">
 
  <table>
   <tr>
    <th align="right" nowrap>[% 'Part' | $T8 %]</th>
-   <td>[% L.part_picker('part_id', SELF.part) %]</td>
+   <td>[% P.part.picker('part_id', SELF.part) %]</td>
   </tr>
 
   <tr>
    <th align="right" nowrap>[% 'Destination warehouse' | $T8 %]</th>
    <td>[% L.select_tag('warehouse_id', SELF.warehouses, default=SELF.warehouse.id, title_key='description') %]
      [% IF SELF.warehouse.id %]
-       [% L.select_tag('bin_id', SELF.warehouse.bins, default=SELF.bin.id, title_key='description') %]
+       [% L.select_tag('bin_id', SELF.warehouse.bins_sorted_naturally, default=SELF.bin.id, title_key='description') %]
       [%- ELSE %]
        <span id='bin_id'></span>
       [% END %]
@@ -29,25 +30,20 @@
 
   <tr>
    <th align="right" nowrap>[% 'Charge number' | $T8 %]</th>
-   <td>[% L.input_tag('chargenumber', SELF.chargenumber, size=30) %]</td>
+   <td>[% L.input_tag('chargenumber', FORM.chargenumber, size=30) %]</td>
   </tr>
 
 [% IF INSTANCE_CONF.get_show_bestbefore %]
   <tr>
    <th align="right" nowrap>[% 'Best Before' | $T8 %]</th>
-   <td>[% L.date_tag('bestbefore', SELF.bestbefore) %]</td>
+   <td>[% L.date_tag('bestbefore', FORM.bestbefore) %]</td>
   </tr>
 [%- END %]
 
-  <tr>
-   <th align="right" nowrap>[% 'EAN' | $T8 %]</th>
-   <td><input name="ean" size="30" value="[% HTML.escape(ean) %]"></td>
-  </tr>
-
   <tr>
    <th align="right" nowrap>[% 'Quantity' | $T8 %]</th>
    <td>
-    <input name="qty" size="10" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
+    [% L.input_tag('qty', LxERP.format_amount(FORM.qty), size=10) %]
 [%- IF SELF.part.unit %]
     [% L.select_tag('unit_id', SELF.part.available_units, title_key='name', default=SELF.unit.id) %]
 [%- ELSE %]
@@ -56,14 +52,16 @@
    </td>
   </tr>
 
+  <tr>
+   <td>[% 'Select type of transfer in' | $T8 %]:</td>
+   <td>[% L.select_tag('transfer_type_id', TRANSFER_TYPES, title_key='description') %] </td>
+  </tr>
+
   <tr>
    <th align="right" nowrap>[% 'Optional comment' | $T8 %]</th>
-   <td><input name="comment" size="60" value="[% HTML.escape(comment) %]"></td>
+   <td>[% L.input_tag('comment', FORM.comment, size=60) %]</td>
   </tr>
  </table>
-
- <input type="hidden" name="action" value="Inventory/dispatch">
- <input type="submit" id='action_stock' class="submit" name="action_stock" value="[% 'Stock' | $T8 %]" [% IF !SELF.part.id %]disabled[% END %]>
 </form>
 
 <div id='stock'>
@@ -81,14 +79,15 @@ function reload_warehouse_selection () {
 function reload_bin_selection () {
   $.post("controller.pl", { action: 'Inventory/warehouse_changed', warehouse_id: function(){ return $('#warehouse_id').val() } }, kivi.eval_json_result);
 }
+function check_part_selection_before_stocking() {
+  if ($('#part_id').val() !== '')
+    return true;
+
+  alert(kivi.t8('No article has been selected yet.'));
+  return false;
+}
 $(function(){
   $('#part_id').change(reload_warehouse_selection);
-  $('#part_id').change(function(){
-    if ($('#part_id').val() > 0)
-      $('#action_stock').removeAttr('disabled');
-    else
-      $('#action_stock').attr('disabled', 'disabled');
-  });
   $('#warehouse_id').change(reload_bin_selection);
 })
 </script>