Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 2bc081d8

Von Sven Schöling vor fast 14 Jahren hinzugefügt

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.

Unterschiede anzeigen:

bin/mozilla/wh.pl
310 310

  
311 311
  } elsif (($form->{partnumber} && ($form->{partnumber} ne $form->{old_partnumber})) || $form->{description} || $form->{ean}) {
312 312

  
313
    $form->{no_services}   = 1;
313
#    $form->{no_services}   = 1; # services may now be transfered. fix for Bug 1383.
314 314
    $form->{no_assemblies} = 0; # assemblies duerfen eingelagert werden (z.B. bei retouren)
315 315

  
316 316
    my $parts = Common->retrieve_parts(\%myconfig, $form, 'description', 1);
templates/webpages/ic/form_header.html
221 221
           </td>
222 222
          </tr>
223 223
        [%- END %]
224
        [%- UNLESS is_service %]
225 224
          <tr>
226 225
           <th align="right" nowrap>[% 'On Hand' | $T8 %]</th>
227 226
           <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
......
246 245
           <th align="right" nowrap><label for="not_discountable">[% 'Not Discountable' | $T8 %]</label></th>
247 246
           <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
248 247
          </tr>
249
        [%- END %]
250 248
        [%- IF id %]
251 249
          <tr>
252 250
           <th align="right" nowrap="true"><label for="obsolete">[% 'Obsolete' | $T8 %]</label></th>
templates/webpages/ic/search.html
38 38
      <tr>
39 39
       <th align="right" nowrap>[% 'Group' | $T8 %]</th>
40 40
       <td><input name="partsgroup" size="20"></td>
41
       [%- UNLESS is_service %]
42 41
       <th align="right" nowrap>[% 'Serial Number' | $T8 %]</th> <td><input name="serialnumber" size="20"></td>
43
       [%- END %]
44 42
      </tr>
45 43

  
46 44
      [%- UNLESS is_service %]
......
74 72
       <td colspan="3">
75 73
        <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
76 74
        <label for="itemstatus_active">[% 'Active' | $T8 %]</label>
77
        [%- UNLESS is_service %]
78 75
        <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
79 76
        <label for="itemstatus_onhand">[% 'On Hand' | $T8 %]</label>
80 77
        <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
81 78
        <label for="itemstatus_short">[% 'Short' | $T8 %]</label>
82
        [%- END %]
83 79
        <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
84 80
        <label for="itemstatus_obsolete">[% 'Obsolete' | $T8 %]</label>
85 81
        <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
......
169 165
           <input name="l_description" id="l_description" class="checkbox" type="checkbox" value="Y" checked>
170 166
           <label for="l_description">[% 'Part Description' | $T8 %]</label>
171 167
          </td>
172
          [%- UNLESS is_service %]
173 168
          <td>
174 169
           <input name="l_serialnumber" id="l_serialnumber" class="checkbox" type="checkbox" value="Y">
175 170
           <label for="l_serialnumber">[% 'Serial Number' | $T8 %]</label>
176 171
          </td>
177
          [%- END %]
178 172
          <td>
179 173
           <input name="l_unit" id="l_unit" class="checkbox" type="checkbox" value="Y" checked>
180 174
           <label for="l_unit">[% 'Unit of measure' | $T8 %]</label>
templates/webpages/wh/warehouse_selection.html
109 109
     <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
110 110
     <td>
111 111
      <input name="description" size="30">
112
      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:')" value="?">
112
      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', '')" value="?">
113 113
     </td>
114 114
    </tr>
115 115

  
templates/webpages/wh/warehouse_selection_stock.html
97 97
     <th align="right" nowrap>[% 'Part Description' | $T8 %]</th>
98 98
     <td>
99 99
      <input name="description" size="30" value="[% HTML.escape(description) %]">
100
      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:click_button=update_button')" value="?">
100
      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'click_button=update_button')" value="?">
101 101
     </td>
102 102
    </tr>
103 103

  

Auch abrufbar als: Unified diff