Revision 82e0eedf
Von Werner Hahn vor fast 2 Jahren hinzugefügt
- ID 82e0eedfc01d77cedf3075ed335281963a92a071
- Vorgänger 2841aa7f
| SL/WH.pm | ||
|---|---|---|
| 269 | 269 |
|
| 270 | 270 |
# if of a property number or description is requested, |
| 271 | 271 |
# automatically check the matching id too. |
| 272 |
map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}description"} || $form->{"l_${_}number"}); } qw(warehouse bin);
|
|
| 272 |
map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}"} || $form->{"l_${_}number"}); } qw(warehouse bin);
|
|
| 273 | 273 |
|
| 274 | 274 |
# customize shown entry for not available fields. |
| 275 | 275 |
$filter{na} = '-' unless $filter{na};
|
| ... | ... | |
| 319 | 319 |
} |
| 320 | 320 |
|
| 321 | 321 |
$select_tokens{'trans'} = {
|
| 322 |
"parts_id" => "i1.parts_id",
|
|
| 323 |
"qty" => "ABS(SUM(i1.qty))",
|
|
| 324 |
"partnumber" => "p.partnumber",
|
|
| 325 |
"partdescription" => "p.description",
|
|
| 326 |
"classification_id" => "p.classification_id",
|
|
| 327 |
"part_type" => "p.part_type",
|
|
| 328 |
"bindescription" => "b.description",
|
|
| 329 |
"chargenumber" => "i1.chargenumber",
|
|
| 330 |
"bestbefore" => "i1.bestbefore",
|
|
| 331 |
"warehousedescription" => "w.description",
|
|
| 332 |
"partunit" => "p.unit",
|
|
| 333 |
"bin_from" => "b1.description",
|
|
| 334 |
"bin_to" => "b2.description",
|
|
| 335 |
"warehouse_from" => "w1.description",
|
|
| 336 |
"warehouse_to" => "w2.description",
|
|
| 337 |
"comment" => "i1.comment",
|
|
| 338 |
"trans_type" => "tt.description",
|
|
| 339 |
"trans_id" => "i1.trans_id",
|
|
| 340 |
"id" => "i1.id",
|
|
| 341 |
"oe_id" => "COALESCE(i1.oe_id, i2.oe_id)",
|
|
| 342 |
"invoice_id" => "COALESCE(i1.invoice_id, i2.invoice_id)",
|
|
| 343 |
"date" => "i1.shippingdate",
|
|
| 344 |
"itime" => "i1.itime",
|
|
| 345 |
"shippingdate" => "i1.shippingdate",
|
|
| 346 |
"employee" => "e.name",
|
|
| 347 |
"projectnumber" => "COALESCE(pr.projectnumber, '$filter{na}')",
|
|
| 322 |
"parts_id" => "i1.parts_id", |
|
| 323 |
"qty" => "ABS(SUM(i1.qty))", |
|
| 324 |
"partnumber" => "p.partnumber", |
|
| 325 |
"partdescription" => "p.description", |
|
| 326 |
"classification_id" => "p.classification_id", |
|
| 327 |
"part_type" => "p.part_type", |
|
| 328 |
"bin" => "b.description",
|
|
| 329 |
"chargenumber" => "i1.chargenumber", |
|
| 330 |
"bestbefore" => "i1.bestbefore", |
|
| 331 |
"warehouse" => "w.description",
|
|
| 332 |
"partunit" => "p.unit", |
|
| 333 |
"bin_from" => "b1.description", |
|
| 334 |
"bin_to" => "b2.description", |
|
| 335 |
"warehouse_from" => "w1.description", |
|
| 336 |
"warehouse_to" => "w2.description", |
|
| 337 |
"comment" => "i1.comment", |
|
| 338 |
"trans_type" => "tt.description", |
|
| 339 |
"trans_id" => "i1.trans_id", |
|
| 340 |
"id" => "i1.id", |
|
| 341 |
"oe_id" => "COALESCE(i1.oe_id, i2.oe_id)", |
|
| 342 |
"invoice_id" => "COALESCE(i1.invoice_id, i2.invoice_id)", |
|
| 343 |
"date" => "i1.shippingdate", |
|
| 344 |
"itime" => "i1.itime", |
|
| 345 |
"shippingdate" => "i1.shippingdate", |
|
| 346 |
"employee" => "e.name", |
|
| 347 |
"projectnumber" => "COALESCE(pr.projectnumber, '$filter{na}')",
|
|
| 348 | 348 |
}; |
| 349 | 349 |
|
| 350 | 350 |
$select_tokens{'out'} = {
|
| ... | ... | |
| 597 | 597 |
|
| 598 | 598 |
# if of a property number or description is requested, |
| 599 | 599 |
# automatically check the matching id too. |
| 600 |
map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}description"} || $form->{"l_${_}number"}); } qw(warehouse bin);
|
|
| 600 |
map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}"} || $form->{"l_${_}number"}); } qw(warehouse bin);
|
|
| 601 | 601 |
|
| 602 | 602 |
# make order, search in $filter and $form |
| 603 | 603 |
my $sort_col = $form->{sort};
|
| bin/mozilla/wh.pl | ||
|---|---|---|
| 239 | 239 |
|
| 240 | 240 |
$form->show_generic_error($locale->text("The source warehouse does not contain any bins.")) if (0 == scalar @{ $warehouse->{BINS} });
|
| 241 | 241 |
|
| 242 |
map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bindescription chargenumber bestbefore partunit);
|
|
| 242 |
map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bin chargenumber bestbefore partunit);
|
|
| 243 | 243 |
|
| 244 | 244 |
$form->{sort} = 'bindescription';
|
| 245 | 245 |
my @contents = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id});
|
| templates/design40_webpages/wh/transfer_parts_selection.html | ||
|---|---|---|
| 95 | 95 |
<input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]"> |
| 96 | 96 |
[% END %] |
| 97 | 97 |
<input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]"> |
| 98 |
[% HTML.escape(row.bindescription) %]
|
|
| 98 |
[% HTML.escape(row.bin) %] |
|
| 99 | 99 |
</td> |
| 100 | 100 |
<td>[% HTML.escape(row.partnumber) %]</td> |
| 101 | 101 |
<td>[% HTML.escape(row.partdescription) %]</td> |
| templates/webpages/wh/transfer_parts_selection.html | ||
|---|---|---|
| 89 | 89 |
<input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]"> |
| 90 | 90 |
[% END %] |
| 91 | 91 |
<input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]"> |
| 92 |
<td>[% HTML.escape(row.bindescription) %]</td>
|
|
| 92 |
<td>[% HTML.escape(row.bin) %]</td> |
|
| 93 | 93 |
<td>[% HTML.escape(row.partnumber) %]</td> |
| 94 | 94 |
<td>[% HTML.escape(row.partdescription) %]</td> |
| 95 | 95 |
<td>[% HTML.escape(row.chargenumber) %]</td> |
Auch abrufbar als: Unified diff
Fix #580 Umlagern