Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 2841aa7f

Von Werner Hahn vor etwa 1 Jahr hinzugefügt

Fix576 Lagentnahme

Unterschiede anzeigen:

SL/WH.pm
516 516
  # filters
517 517
  my (@filter_ary, @filter_vars, @wh_bin_filter_ary, @wh_bin_filter_vars);
518 518

  
519
  delete $form->{include_empty_bins} unless ($form->{l_warehousedescription} || $form->{l_bindescription});
519
  delete $form->{include_empty_bins} unless ($form->{l_warehouse} || $form->{l_bin});
520 520

  
521 521
  if ($filter{warehouse_id}) {
522 522
    push @wh_bin_filter_ary,  "w.id = ?";
bin/mozilla/wh.pl
183 183

  
184 184
  $form->show_generic_error($locale->text("The source warehouse does not contain any bins.")) if (0 == scalar @{ $warehouse->{BINS} });
185 185

  
186
  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bindescription chargenumber bestbefore partunit ean);
186
  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bin chargenumber bestbefore partunit ean);
187 187

  
188 188
  $form->{sort} = 'bindescription';
189 189
  my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id},
......
479 479

  
480 480
  $form->show_generic_error($locale->text("The warehouse does not contain any bins.")) if (0 == scalar @{ $warehouse->{BINS} });
481 481

  
482
  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bindescription chargenumber bestbefore partunit);
482
  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bin chargenumber bestbefore partunit);
483 483

  
484 484
  $form->{sort} = 'bindescription';
485 485
  my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id});
templates/webpages/wh/removal_parts_selection.html
52 52
     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
53 53
     [% END %]
54 54
     <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
55
     <td>[% HTML.escape(row.bindescription) %]</td>
55
     <td>[% HTML.escape(row.bin) %]</td>
56 56
     <td>[% HTML.escape(row.partnumber) %]</td>
57 57
     <td>[% HTML.escape(row.partdescription) %]</td>
58 58
     <td>[% HTML.escape(row.chargenumber) %]</td>

Auch abrufbar als: Unified diff