From 96a2fd5fd56cb0b0e8334a67ed68264c00727d0a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Wed, 17 Jul 2013 14:46:05 +0200 Subject: [PATCH] Lagerbestand anzeigen, zeigt jetzt auch die Filteroptionen an Analog wie bei allen anderen Berichten (report_generator) --- bin/mozilla/wh.pl | 19 ++++++++++++++++++- doc/changelog | 2 ++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl index b8cda2b2c..15f58fc5d 100644 --- a/bin/mozilla/wh.pl +++ b/bin/mozilla/wh.pl @@ -829,6 +829,22 @@ sub generate_report { # 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 = { + 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) { + defined $dispatch_options->{$_} && $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.')); @@ -872,7 +888,8 @@ sub generate_report { $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(); diff --git a/doc/changelog b/doc/changelog index 95a0b2ed7..51fe49c72 100644 --- a/doc/changelog +++ b/doc/changelog @@ -54,6 +54,8 @@ Kleinere neue Features und Detailverbesserungen: - Offene Forderungen / Verbindlichkeiten Stichtagsbezogene Auswahl korrekt mit Fälligkeit verrechnet +- Lagerbestand anzeigen, zeigt auch die Filteroptionen an + - #1897 implementiert. Zukunfts-Buchungen verhindern, durch einen konfigurierbaren maximalen Zeitraum in dem in die Zukunft gebucht werden darf (default 360 Tage) -- 2.20.1