Revision 60d62c9e
Von Jan Büren vor fast 13 Jahren hinzugefügt
SL/WH.pm | ||
---|---|---|
626 | 626 |
push @filter_ary, "i.itime <= ?"; |
627 | 627 |
push @filter_vars, $filter{date}; |
628 | 628 |
} |
629 |
if (!$filter{include_invalid_warehouses}){ |
|
630 |
push @filter_ary, "NOT (w.invalid)"; |
|
631 |
} |
|
629 | 632 |
|
630 | 633 |
# prepare qty comparison for later filtering |
631 | 634 |
my ($f_qty_op, $f_qty, $f_qty_base_unit); |
bin/mozilla/wh.pl | ||
---|---|---|
824 | 824 |
my @columns = qw(warehousedescription bindescription partnumber partdescription chargenumber bestbefore qty stock_value); |
825 | 825 |
|
826 | 826 |
# filter stuff |
827 |
map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore date); |
|
827 |
map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore date include_invalid_warehouses);
|
|
828 | 828 |
|
829 | 829 |
$filter{qty_op} = WH->convert_qty_op($form->{qty_op}); |
830 | 830 |
if ($filter{qty_op}) { |
... | ... | |
842 | 842 |
|
843 | 843 |
my @hidden_variables = map { "l_${_}" } @columns; |
844 | 844 |
push @hidden_variables, qw(warehouse_id bin_id partnumber description chargenumber bestbefore qty_op qty qty_unit l_warehousedescription l_bindescription); |
845 |
push @hidden_variables, qw(include_empty_bins subtotal); |
|
845 |
push @hidden_variables, qw(include_empty_bins subtotal include_invalid_warehouses);
|
|
846 | 846 |
|
847 | 847 |
my %column_defs = ( |
848 | 848 |
'warehousedescription' => { 'text' => $locale->text('Warehouse'), }, |
locale/de/all | ||
---|---|---|
939 | 939 |
'Include empty bins' => 'Leere Lagerplätze anzeigen', |
940 | 940 |
'Include in Report' => 'In Bericht aufnehmen', |
941 | 941 |
'Include in drop-down menus' => 'In Aufklappmenü aufnehmen', |
942 |
'Include invalid warehouses ' => 'Ungültige Lager berücksichtigen', |
|
942 | 943 |
'Includeable in reports' => 'In Berichten anzeigbar', |
943 | 944 |
'Including' => 'Enthaltene', |
944 | 945 |
'Income Statement' => 'GuV', |
templates/webpages/wh/report_filter.html | ||
---|---|---|
175 | 175 |
<td nowrap><label for="subtotal">[% 'Subtotal' | $T8 %]</label></td> |
176 | 176 |
<td align="right"><input name="include_empty_bins" id="include_empty_bins" class="checkbox" type="checkbox" value="Y"></td> |
177 | 177 |
<td nowrap><label for="include_empty_bins">[% 'Include empty bins' | $T8 %]</label></td> |
178 |
<td align="right"><input name="include_invalid_warehouses" id="include_invalid_warehouses" class="checkbox" type="checkbox" value="Y"></td> |
|
179 |
<td nowrap><label for="include_invalid_warehouses">[% 'Include invalid warehouses ' | $T8 %]</label></td> |
|
178 | 180 |
</tr> |
179 | 181 |
|
180 | 182 |
<tr> |
Auch abrufbar als: Unified diff
Ungültige Lager aus dem Warenbestand filtern
Setzt man Lager auf ungültig, so werden diese in der Auswahlliste bei
Lagerbestand und bei Lagerbewegungen rausgefiltert, lässt man die Auswahl
allerdings leer, so werden auch ungültige Lager inkl. Bestand angezeigt.
Zumindestens für Bestand einen entsprechenden Filter gesetzt.