Revision a3153d12
Von Bernd Bleßmann vor fast 2 Jahren hinzugefügt
| SL/WH.pm | ||
|---|---|---|
|
"partdescription" => "p.description",
|
||
|
"classification_id" => "p.classification_id",
|
||
|
"part_type" => "p.part_type",
|
||
|
"bindescription" => "b.description",
|
||
|
"bin" => "b.description",
|
||
|
"binid" => "b.id",
|
||
|
"chargenumber" => "i.chargenumber",
|
||
|
"bestbefore" => "i.bestbefore",
|
||
|
"ean" => "p.ean",
|
||
|
"chargeid" => "c.id",
|
||
|
"warehousedescription" => "w.description",
|
||
|
"warehouse" => "w.description",
|
||
|
"partunit" => "p.unit",
|
||
|
"stock_value" => ($form->{stock_value_basis} // '') eq 'list_price' ? "p.listprice / COALESCE(pfac.factor, 1)" : "p.lastcost / COALESCE(pfac.factor, 1)",
|
||
|
"purchase_price" => "p.lastcost",
|
||
| ... | ... | |
|
if ($form->{include_empty_bins}) {
|
||
|
$query =
|
||
|
qq|SELECT
|
||
|
w.id AS warehouseid, w.description AS warehousedescription,
|
||
|
b.id AS binid, b.description AS bindescription
|
||
|
w.id AS warehouseid, w.description AS warehouse,
|
||
|
b.id AS binid, b.description AS bin
|
||
|
FROM bin b
|
||
|
LEFT JOIN warehouse w ON (b.warehouse_id = w.id)|;
|
||
|
|
||
| ... | ... | |
|
}
|
||
|
$sth->finish();
|
||
|
|
||
|
if (grep { $orderby eq $_ } qw(bindescription warehousedescription)) {
|
||
|
if (grep { $orderby eq $_ } qw(bin warehouse)) {
|
||
|
@contents = sort { ($a->{$orderby} cmp $b->{$orderby}) * (($form->{order}) ? 1 : -1) } @contents;
|
||
|
}
|
||
|
}
|
||
| bin/mozilla/wh.pl | ||
|---|---|---|
|
my $sort_col = $form->{sort};
|
||
|
|
||
|
my %filter;
|
||
|
my @columns = qw(warehousedescription bindescription partnumber type_and_classific partdescription chargenumber bestbefore comment qty partunit list_price purchase_price stock_value);
|
||
|
my @columns = qw(warehouse bin partnumber type_and_classific partdescription chargenumber bestbefore comment qty partunit list_price purchase_price stock_value);
|
||
|
|
||
|
# filter stuff
|
||
|
map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id classification_id partnumber description partsgroup_id chargenumber bestbefore date include_invalid_warehouses);
|
||
| ... | ... | |
|
push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
|
||
|
|
||
|
my @hidden_variables = map { "l_${_}" } @columns;
|
||
|
push @hidden_variables, qw(warehouse_id bin_id partnumber partstypes_id description partsgroup_id chargenumber bestbefore qty_op qty qty_unit partunit l_warehousedescription l_bindescription);
|
||
|
push @hidden_variables, qw(warehouse_id bin_id partnumber partstypes_id description partsgroup_id chargenumber bestbefore qty_op qty qty_unit partunit l_warehouse l_bin);
|
||
|
push @hidden_variables, qw(include_empty_bins subtotal include_invalid_warehouses date);
|
||
|
push @hidden_variables, qw(classification_id stock_value_basis allrows);
|
||
|
push @hidden_variables, map({'cvar_'. $_->{name}} @searchable_custom_variables);
|
||
| ... | ... | |
|
push @hidden_variables, map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables));
|
||
|
|
||
|
my %column_defs = (
|
||
|
'warehousedescription' => { 'text' => $locale->text('Warehouse'), },
|
||
|
'bindescription' => { 'text' => $locale->text('Bin'), },
|
||
|
'warehouse' => { 'text' => $locale->text('Warehouse'), },
|
||
|
'bin' => { 'text' => $locale->text('Bin'), },
|
||
|
'partnumber' => { 'text' => $locale->text('Part Number'), },
|
||
|
'type_and_classific' => { 'text' => $locale->text('Type'), },
|
||
|
'partdescription' => { 'text' => $locale->text('Part Description'), },
|
||
| templates/design40_webpages/wh/report_filter.html | ||
|---|---|---|
|
<div class="list col">
|
||
|
<h4>[% 'Warehouse & Article' | $T8 %]</h4>
|
||
|
<div>
|
||
|
<input name="l_warehousedescription" id="l_warehousedescription" type="checkbox" value="Y" checked>
|
||
|
<label for="l_warehousedescription">[% 'Warehouse' | $T8 %]</label>
|
||
|
<input name="l_warehouse" id="l_warehouse" type="checkbox" value="Y" checked>
|
||
|
<label for="l_warehouse">[% 'Warehouse' | $T8 %]</label>
|
||
|
</div>
|
||
|
<div>
|
||
|
<input name="l_bindescription" id="l_bindescription" type="checkbox" value="Y" checked>
|
||
|
<label for="l_bindescription">[% 'Bin' | $T8 %]</label>
|
||
|
<input name="l_bin" id="l_bin" type="checkbox" value="Y" checked>
|
||
|
<label for="l_bin">[% 'Bin' | $T8 %]</label>
|
||
|
</div>
|
||
|
<div>
|
||
|
<input name="l_partnumber" id="l_partnumber" type="checkbox" value="Y" checked>
|
||
| templates/webpages/wh/report_filter.html | ||
|---|---|---|
|
|
||
|
<table>
|
||
|
<tr>
|
||
|
<td align="right"><input name="l_warehousedescription" id="l_warehousedescription" class="checkbox" type="checkbox" value="Y" checked></td>
|
||
|
<td nowrap><label for="l_warehousedescription">[% 'Warehouse' | $T8 %]</label></td>
|
||
|
<td align="right"><input name="l_bindescription" id="l_bindescription" class="checkbox" type="checkbox" value="Y" checked></td>
|
||
|
<td nowrap><label for="l_bindescription">[% 'Bin' | $T8 %]</label></td>
|
||
|
<td align="right"><input name="l_warehouse" id="l_warehouse" class="checkbox" type="checkbox" value="Y" checked></td>
|
||
|
<td nowrap><label for="l_warehouse">[% 'Warehouse' | $T8 %]</label></td>
|
||
|
<td align="right"><input name="l_bin" id="l_bin" class="checkbox" type="checkbox" value="Y" checked></td>
|
||
|
<td nowrap><label for="l_bin">[% 'Bin' | $T8 %]</label></td>
|
||
|
</tr>
|
||
|
|
||
|
<tr>
|
||
Auch abrufbar als: Unified diff
Lagerstandsbericht: Export/keys für "für Import kompatibel machen" anpassen
Behebt #558 (redmine)