projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Report in der richtigen Reihenfolge speichern und anzeigen.
[kivitendo-erp.git]
/
SL
/
WH.pm
diff --git
a/SL/WH.pm
b/SL/WH.pm
index
352ca1a
..
28e836e
100644
(file)
--- a/
SL/WH.pm
+++ b/
SL/WH.pm
@@
-111,10
+111,11
@@
sub transfer {
);
if ($unit) {
);
if ($unit) {
- $qty *= $unit->factor || 1;
- $qty /= $part->unit_obj->factor || 1 if $part->unit;
+ $qty = $unit->convert_to($qty, $part->unit_obj);
}
}
+ $params{chargenumber} ||= '';
+
if ($direction & 1) {
SL::DB::Inventory->new(
%params,
if ($direction & 1) {
SL::DB::Inventory->new(
%params,
@@
-620,6
+621,14
@@
sub get_warehouse_report {
push @filter_vars, '%' . $filter{ean} . '%';
}
push @filter_vars, '%' . $filter{ean} . '%';
}
+ if ($filter{date}) {
+ push @filter_ary, "i.itime <= ?";
+ push @filter_vars, $filter{date};
+ }
+ if (!$filter{include_invalid_warehouses}){
+ push @filter_ary, "NOT (w.invalid)";
+ }
+
# prepare qty comparison for later filtering
my ($f_qty_op, $f_qty, $f_qty_base_unit);
# prepare qty comparison for later filtering
my ($f_qty_op, $f_qty, $f_qty_base_unit);
@@
-1013,6
+1022,8
@@
An expiration date. Note that this is not by default used by C<warehouse_report>
=head1 BUGS
=head1 BUGS
+None yet.
+
=head1 AUTHOR
=cut
=head1 AUTHOR
=cut