X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDO.pm;h=f391963235d72faa09a4a640b763aaed8fe194be;hb=89c9ff022d3f13e27ba6bda085df15707fcfb0eb;hp=c509a0e4a1c587ee341ce276bcf3129cb86b08fe;hpb=831f10968e839d686e9d10881211ecdc578de613;p=kivitendo-erp.git diff --git a/SL/DO.pm b/SL/DO.pm index c509a0e4a..f39196323 100644 --- a/SL/DO.pm +++ b/SL/DO.pm @@ -383,7 +383,7 @@ sub save { $form->{saved_donumber} = $form->{donumber}; - Common::webdav_folder($form) if ($main::webdav); + Common::webdav_folder($form); $main::lxdebug->leave_sub(); @@ -491,7 +491,7 @@ sub delete { my $myconfig = \%main::myconfig; my $form = $main::form; - my $spool = $main::spool; + my $spool = $::lx_office_conf{paths}->{spool}; # connect to database my $dbh = $form->get_standard_dbh($myconfig); @@ -623,6 +623,8 @@ sub retrieve { } $sth->finish(); + $form->{donumber_array} =~ s/\s*$//g; + $form->{saved_donumber} = $form->{donumber}; # if not given, fill transdate with current_date @@ -710,7 +712,7 @@ sub retrieve { $sth->finish(); } - Common::webdav_folder($form) if ($main::webdav); + Common::webdav_folder($form); $main::lxdebug->leave_sub(); @@ -937,7 +939,7 @@ sub unpack_stock_information { } sub get_item_availability { - $main::lxdebug->enter_sub(); + $::lxdebug->enter_sub; my $self = shift; my %params = @_; @@ -945,8 +947,6 @@ sub get_item_availability { Common::check_params(\%params, qw(parts_id)); my @parts_ids = 'ARRAY' eq ref $params{parts_id} ? @{ $params{parts_id} } : ($params{parts_id}); - my $form = $main::form; - my $myconfig = \%main::myconfig; my $query = qq|SELECT i.warehouse_id, i.bin_id, i.chargenumber, i.bestbefore, SUM(qty) AS qty, i.parts_id, @@ -960,9 +960,9 @@ sub get_item_availability { HAVING SUM(qty) > 0 ORDER BY LOWER(w.description), LOWER(b.description), LOWER(i.chargenumber), i.bestbefore |; - my $contents = selectall_hashref_query($form, $form->get_standard_dbh($myconfig), $query, @parts_ids); + my $contents = selectall_hashref_query($::form, $::form->get_standard_dbh, $query, @parts_ids); - $main::lxdebug->leave_sub(); + $::lxdebug->leave_sub; return @{ $contents }; } @@ -1051,6 +1051,7 @@ sub transfer_in_out { 'oe_id' => $form->{id}, 'shippingdate' => 'current_date', 'transfer_type' => $params{direction} eq 'in' ? 'stock' : 'shipped', + 'project_id' => $request->{project_id}, }; }