Lagerbewegungen auch für Dienstleistungen friegeben.

Fix für Bug 1383.

Da sich Lagerbewegungen sowieso nicht komplett aus den Dienstleistungen
raushalten ließen, und es überzeugende Argumente dafür gibt Dienstleistungen
auch einlagern zu können, entfernt dieser Patch die Beschränkung, dass nur Waren
eingelagert werden dürfen.

diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index a55bf70c676e8369eca6aea02b6cf97c3ce84055..30ee326760f7c8226035fc4a659ae459f3eef7b4 100644 (file)
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -310,7 +310,7 @@ sub transfer_stock_update_part {
 
   } elsif (($form->{partnumber} && ($form->{partnumber} ne $form->{old_partnumber})) || $form->{description} || $form->{ean}) {
 
-    $form->{no_services}   = 1;
+#    $form->{no_services}   = 1; # services may now be transfered. fix for Bug 1383.
     $form->{no_assemblies} = 0; # assemblies duerfen eingelagert werden (z.B. bei retouren)
 
     my $parts = Common->retrieve_parts(\%myconfig, $form, 'description', 1);

diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html
index 136be7073cd479dfdee3fabcc3a8de0f40be1a5d..1b3ea9afbb4f00d5ff2726acf9dd50f409a86fc6 100644 (file)
--- a/templates/webpages/ic/form_header.html
+++ b/templates/webpages/ic/form_header.html
@@ -221,7 +221,6 @@
            </td>
           </tr>
         [%- END %]
-        [%- UNLESS is_service %]
           <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>
@@ -246,7 +245,6 @@
            <th align="right" nowrap><label for="not_discountable">[% 'Not Discountable' | $T8 %]</label></th>
            <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
           </tr>
-        [%- END %]
         [%- IF id %]
           <tr>
            <th align="right" nowrap="true"><label for="obsolete">[% 'Obsolete' | $T8 %]</label></th>

diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index 25625a5ec8dc58ff60cf2c0633e0d8c977709152..df16c0b7c7dc1178d093ececce28fb85bfb331e4 100644 (file)
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -38,9 +38,7 @@
       <tr>
        <th align="right" nowrap>[% 'Group' | $T8 %]</th>
        <td><input name="partsgroup" size="20"></td>
-       [%- UNLESS is_service %]
        <th align="right" nowrap>[% 'Serial Number' | $T8 %]</th> <td><input name="serialnumber" size="20"></td>
-       [%- END %]
       </tr>
 
       [%- UNLESS is_service %]
@@ -74,12 +72,10 @@
        <td colspan="3">
         <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
         <label for="itemstatus_active">[% 'Active' | $T8 %]</label>
-        [%- UNLESS is_service %]
         <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
         <label for="itemstatus_onhand">[% 'On Hand' | $T8 %]</label>
         <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
         <label for="itemstatus_short">[% 'Short' | $T8 %]</label>
-        [%- END %]
         <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
         <label for="itemstatus_obsolete">[% 'Obsolete' | $T8 %]</label>
         <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
@@ -169,12 +165,10 @@
            <input name="l_description" id="l_description" class="checkbox" type="checkbox" value="Y" checked>
            <label for="l_description">[% 'Part Description' | $T8 %]</label>
           </td>
-          [%- UNLESS is_service %]
           <td>
            <input name="l_serialnumber" id="l_serialnumber" class="checkbox" type="checkbox" value="Y">
            <label for="l_serialnumber">[% 'Serial Number' | $T8 %]</label>
           </td>
-          [%- END %]
           <td>
            <input name="l_unit" id="l_unit" class="checkbox" type="checkbox" value="Y" checked>
            <label for="l_unit">[% 'Unit of measure' | $T8 %]</label>

diff --git a/templates/webpages/wh/warehouse_selection.html b/templates/webpages/wh/warehouse_selection.html
index afdc7a4ea2fc794e078ff2c57cb9ed298f22a950..0f499b28f4cb3be52fa4f57cbdd28d4325096679 100644 (file)
--- a/templates/webpages/wh/warehouse_selection.html
+++ b/templates/webpages/wh/warehouse_selection.html
@@ -109,7 +109,7 @@
      <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
      <td>
       <input name="description" size="30">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:')" value="?">
+      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', '')" value="?">
      </td>
     </tr>
 

diff --git a/templates/webpages/wh/warehouse_selection_stock.html b/templates/webpages/wh/warehouse_selection_stock.html
index ca164a53bb2bb571125edc9fc8a700caad9d835c..4bb3c04e9d6316bb55443a90aa6efeb89cb2b0a8 100644 (file)
--- a/templates/webpages/wh/warehouse_selection_stock.html
+++ b/templates/webpages/wh/warehouse_selection_stock.html
@@ -97,7 +97,7 @@
      <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
      <td>
       <input name="description" size="30" value="[% HTML.escape(description) %]">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:click_button=update_button')" value="?">
+      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'click_button=update_button')" value="?">
      </td>
     </tr>