From 45620ee59ab687e188d37a2eb937b896debc8a29 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Wed, 11 Jan 2012 11:33:31 +0100 Subject: [PATCH] =?utf8?q?Lagerbestand=20auch=20f=C3=BCr=20andere=20Daten?= =?utf8?q?=20als=20heute=20anzeigbar.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/WH.pm | 5 +++++ bin/mozilla/wh.pl | 2 +- locale/de/all | 3 ++- templates/webpages/wh/report_filter.html | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/SL/WH.pm b/SL/WH.pm index 352ca1af8..f760f5e9b 100644 --- a/SL/WH.pm +++ b/SL/WH.pm @@ -620,6 +620,11 @@ sub get_warehouse_report { push @filter_vars, '%' . $filter{ean} . '%'; } + if ($filter{date}) { + push @filter_ary, "i.itime <= ?"; + push @filter_vars, $filter{date}; + } + # prepare qty comparison for later filtering my ($f_qty_op, $f_qty, $f_qty_base_unit); diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl index 2b49ba00c..62be1d1d7 100644 --- a/bin/mozilla/wh.pl +++ b/bin/mozilla/wh.pl @@ -824,7 +824,7 @@ sub generate_report { my @columns = qw(warehousedescription bindescription partnumber partdescription chargenumber bestbefore qty stock_value); # filter stuff - map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore); + map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore date); $filter{qty_op} = WH->convert_qty_op($form->{qty_op}); if ($filter{qty_op}) { diff --git a/locale/de/all b/locale/de/all index 6e5013b2f..9e3ba9eae 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1407,7 +1407,7 @@ $self->{texts} = { 'Proforma Invoice' => 'Proformarechnung', 'Program' => 'Programm', 'Project' => 'Projekt', - 'Project Description' => '', + 'Project Description' => 'Projektbeschreibung', 'Project Number' => 'Projektnummer', 'Project Number missing!' => 'Projektnummer fehlt!', 'Project Numbers' => 'Projektnummern', @@ -1655,6 +1655,7 @@ $self->{texts} = { 'Step 3 of 3: Default units' => 'Schritt 3 von 3: Standardeinheiten', 'Steuersatz' => 'Steuersatz', 'Stock' => 'Einlagern', + 'Stock Qty for Date' => 'Lagerbestand am', 'Stock value' => 'Bestandswert', 'Stocked Qty' => 'Lagermenge', 'Storno' => 'Storno', diff --git a/templates/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html index affe4c265..a5cbe12d8 100644 --- a/templates/webpages/wh/report_filter.html +++ b/templates/webpages/wh/report_filter.html @@ -1,4 +1,5 @@ [%- USE T8 %] +[%- USE L %] [% USE HTML %][% USE JavaScript %]