X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FWH.pm;h=eb376268222ebeb56c02a5a1821d1dfe7a97fa7f;hb=23551aa675eb5966b8135e8797243364e709965f;hp=e98321616540087a7ef5f13bdedbdbfba9ff7e98;hpb=3664e6cf5b0b6fb1b48b666415034668cfd8b095;p=kivitendo-erp.git diff --git a/SL/WH.pm b/SL/WH.pm index e98321616..eb3762682 100644 --- a/SL/WH.pm +++ b/SL/WH.pm @@ -73,6 +73,8 @@ sub transfer { return; }; + my @trans_ids; + my $db = SL::DB::Inventory->new->db; $db->do_transaction(sub{ while (my $transfer = shift @args) { @@ -113,6 +115,8 @@ sub transfer { $qty /= $part->unit_obj->factor || 1 if $part->unit; } + $params{chargenumber} ||= ''; + if ($direction & 1) { SL::DB::Inventory->new( %params, @@ -130,12 +134,16 @@ sub transfer { qty => $qty, )->save; } + + push @trans_ids, $trans_id; } }) or do { $::form->error("Warehouse transfer error: " . join("\n", (split(/\n/, $db->error))[0..2])); }; $::lxdebug->leave_sub; + + return @trans_ids; } sub transfer_assembly { @@ -614,6 +622,11 @@ sub get_warehouse_report { push @filter_vars, '%' . $filter{ean} . '%'; } + if ($filter{date}) { + push @filter_ary, "i.itime <= ?"; + push @filter_vars, $filter{date}; + } + # prepare qty comparison for later filtering my ($f_qty_op, $f_qty, $f_qty_base_unit);