# Anm. jb 18.3. vielleicht auch nur meine unwissenheit in perl-datenstrukturen
my %TRANSFER = (
'transfer_type' => 'assembly',
- 'login' => $form->{login},
+ 'login' => $::myconfig{login},
'dst_warehouse_id' => $form->{warehouse_id},
'dst_bin_id' => $form->{bin_id},
'chargenumber' => $form->{chargenumber},
# filter stuff
map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore date include_invalid_warehouses);
+ # show filter stuff also in report
+ my @options;
+ # dispatch all options
+ my $dispatch_options = {
+ warehouse_id => sub { push @options, $locale->text('Warehouse') . " : " .
+ SL::DB::Manager::Warehouse->find_by(id => $form->{warehouse_id})->description},
+ bin_id => sub { push @options, $locale->text('Bin') . " : " .
+ SL::DB::Manager::Bin->find_by(id => $form->{bin_id})->description},
+ partnumber => sub { push @options, $locale->text('Partnumber') . " : $form->{partnumber}"},
+ description => sub { push @options, $locale->text('Description') . " : $form->{description}"},
+ chargenumber => sub { push @options, $locale->text('Charge Number') . " : $form->{chargenumber}"},
+ bestbefore => sub { push @options, $locale->text('Best Before') . " : $form->{bestbefore}"},
+ date => sub { push @options, $locale->text('Date') . " : $form->{date}"},
+ include_invalid_warehouses => sub { push @options, $locale->text('Include invalid warehouses ')},
+ };
+ foreach (keys %filter) {
+ $dispatch_options->{$_}->() if $dispatch_options->{$_};
+ }
+ # / end show filter stuff also in report
+
$filter{qty_op} = WH->convert_qty_op($form->{qty_op});
if ($filter{qty_op}) {
$form->isblank("qty", $locale->text('Quantity missing.'));
$report->set_sort_indicator($sort_col, $form->{order});
- $report->set_options('output_format' => 'HTML',
+ $report->set_options('top_info_text' => join("\n", @options),
+ 'output_format' => 'HTML',
'title' => $form->{title},
'attachment_basename' => strftime($locale->text('warehouse_report_list') . '_%Y%m%d', localtime time));
$report->set_options_from_form();
my $msg = $locale->text('No warehouse has been created yet or the quantity of the bins is not configured yet.') . ' ';
- if ($main::auth->check_right($form->{login}, 'config')) {
+ if ($main::auth->check_right($::myconfig{login}, 'config')) {
$msg .= $locale->text('You can create warehouses and bins via the menu "System -> Warehouses".');
} else {
$msg .= $locale->text('Please ask your administrator to create warehouses and bins.');