Revision 21ca8cb7
Von Jan Büren vor mehr als 15 Jahren hinzugefügt
SL/WH.pm | ||
---|---|---|
438 | 438 |
# - partsid - will return matches with this parts_id only |
439 | 439 |
# - description - will return only matches where the given string is a substring of the description |
440 | 440 |
# - chargenumber - will return only matches where the given string is a substring of the chargenumber |
441 |
# - ean - will return only matches where the given string is a substring of the ean as stored in the table parts (article) |
|
441 | 442 |
# - charge_ids - must be an arrayref. will return contents with these ids only |
442 | 443 |
# - expires_in - will only return matches that expire within the given number of days |
443 | 444 |
# will also add a column named 'has_expired' containing if the match has already expired or not |
... | ... | |
499 | 500 |
push @filter_ary, "i.chargenumber ILIKE ?"; |
500 | 501 |
push @filter_vars, '%' . $filter{chargenumber} . '%'; |
501 | 502 |
} |
503 |
if ($filter{ean}) { |
|
504 |
push @filter_ary, "p.ean ILIKE ?"; |
|
505 |
push @filter_vars, '%' . $filter{ean} . '%'; |
|
506 |
} |
|
502 | 507 |
|
503 | 508 |
# prepare qty comparison for later filtering |
504 | 509 |
my ($f_qty_op, $f_qty, $f_qty_base_unit); |
... | ... | |
534 | 539 |
"bindescription" => "b.description", |
535 | 540 |
"binid" => "b.id", |
536 | 541 |
"chargenumber" => "i.chargenumber", |
542 |
"ean" => "p.ean", |
|
537 | 543 |
"chargeid" => "c.id", |
538 | 544 |
"warehousedescription" => "w.description", |
539 | 545 |
"partunit" => "p.unit", |
bin/mozilla/wh.pl | ||
---|---|---|
156 | 156 |
my @contents = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id}, |
157 | 157 |
"bin_id" => $form->{bin_id}, |
158 | 158 |
"chargenumber" => $form->{chargenumber}, |
159 |
"partnumber" => $form->{partnumber}, |
|
159 |
"partnumber" => $form->{partnumber}, |
|
160 |
"ean" => $form->{ean}, |
|
160 | 161 |
"description" => $form->{description}); |
161 | 162 |
|
162 | 163 |
$form->show_generic_error($locale->text("The selected warehouse is empty.")) if (0 == scalar(@contents)); |
templates/webpages/wh/warehouse_selection_de.html | ||
---|---|---|
115 | 115 |
<th align="right" nowrap>Chargennummer</th> |
116 | 116 |
<td><input name="chargenumber" size="30"></td> |
117 | 117 |
</tr> |
118 |
<tr> |
|
119 |
<th align="right" nowrap>EAN</th> |
|
120 |
<td><input name="ean" size="30"></td> |
|
121 |
</tr> |
|
118 | 122 |
</table> |
119 | 123 |
</p> |
120 | 124 |
|
templates/webpages/wh/warehouse_selection_master.html | ||
---|---|---|
118 | 118 |
<th align="right" nowrap><translate>Charge number</translate></th> |
119 | 119 |
<td><input name="chargenumber" size="30"></td> |
120 | 120 |
</tr> |
121 |
<tr> |
|
122 |
<th align="right" nowrap><translate>EAN</translate></th> |
|
123 |
<td><input name="ean" size="30"></td> |
|
124 |
</tr> |
|
121 | 125 |
</table> |
122 | 126 |
</p> |
123 | 127 |
|
Auch abrufbar als: Unified diff
Erste Aenderung fuer die Umsetzung der Bugzilla Erweiterung 856 Warenbewegung im Lager per EAN suchbar machen - Anpassung fuer die Umlagermaske - Im anschliessenden Bericht wird die EAN nicht angezeigt