X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FWH.pm;h=669b295fef3479ccf48b01e334eaafd7d4404911;hb=abc7d88b97193fe5c1c23071cd56b62e928b1fd9;hp=b164a306499b27b23a217f173125f79ef72877d1;hpb=831f10968e839d686e9d10881211ecdc578de613;p=kivitendo-erp.git diff --git a/SL/WH.pm b/SL/WH.pm index b164a3064..669b295fe 100644 --- a/SL/WH.pm +++ b/SL/WH.pm @@ -99,7 +99,8 @@ sub transfer { } else { push @values, $transfer_types{$directions[$direction]}->{$transfer->{transfer_type}}; } - + + $transfer->{comment} = defined($transfer->{comment}) ? $transfer->{comment} : ''; push @values, "$transfer->{comment}"; my $qty = $transfer->{qty}; @@ -279,12 +280,12 @@ sub get_warehouse_journal { # filters my (@filter_ary, @filter_vars, $joins, %select_tokens, %select); - if ($filter{warehouse_id} ne '') { + if ($filter{warehouse_id}) { push @filter_ary, "w1.id = ? OR w2.id = ?"; push @filter_vars, $filter{warehouse_id}, $filter{warehouse_id}; } - if ($filter{bin_id} ne '') { + if ($filter{bin_id}) { push @filter_ary, "b1.id = ? OR b2.id = ?"; push @filter_vars, $filter{bin_id}, $filter{bin_id}; } @@ -396,6 +397,7 @@ sub get_warehouse_journal { my $group_clause = join ", ", map { +/^l_/; "r_$'" } ( grep( { !/qty$/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), qw(l_parts_id l_partunit l_itime) ); + $where_clause = defined($where_clause) ? $where_clause : ''; my $query = qq|SELECT DISTINCT $select{trans} FROM inventory i1