X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FWH.pm;h=895db95e5e2745a4c01766107cdf050a7fa52403;hb=5f4bdff3ce2e439867671d2dcc3d869942ce140b;hp=78a1442e56f34febec278459986a8235c138a039;hpb=3c938e03dbb186f9c163e19473e9572f7fa16aea;p=kivitendo-erp.git

diff --git a/SL/WH.pm b/SL/WH.pm
index 78a1442e5..895db95e5 100644
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -438,6 +438,7 @@ sub get_warehouse_journal {
     'trans_type'     => ['trans_type'],
     'employee'       => ['employee'],
     'projectnumber'  => ['projectnumber'],
+    'chargenumber'   => ['chargenumber'],
   );
 
   $sort_order    = $filter{order}  unless $sort_order;
@@ -552,10 +553,18 @@ sub get_warehouse_journal {
     GROUP BY $group_clause
     ORDER BY r_${sort_spec}) AS lines WHERE r_qty>0|;
 
-  $query .= " LIMIT $filter{limit}"    if $filter{limit} ;
-  $query .= " OFFSET $filter{offset}"  if $filter{offset} ;
+  my @all_vars = (@filter_vars,@filter_vars,@filter_vars);
 
-  my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars, @filter_vars, @filter_vars);
+  if ($filter{limit}) {
+    $query .= " LIMIT ?";
+    push @all_vars,$filter{limit};
+  }
+  if ($filter{offset}) {
+    $query .= " OFFSET ?";
+    push @all_vars, $filter{offset};
+  }
+
+  my $sth = prepare_execute_query($form, $dbh, $query, @all_vars);
 
   my ($h_oe_id, $q_oe_id);
   if ($form->{l_oe_id}) {
@@ -824,10 +833,15 @@ sub get_warehouse_report {
       GROUP BY $group_clause
       ORDER BY $sort_spec ) AS lines WHERE qty<>0|;
 
-  $query .= " LIMIT $filter{limit}"    if $filter{limit} ;
-  $query .= " OFFSET $filter{offset}"  if $filter{offset} ;
-
-  my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars);
+  if ($filter{limit}) {
+    $query .= " LIMIT ?";
+    push @filter_vars,$filter{limit};
+  }
+  if ($filter{offset}) {
+    $query .= " OFFSET ?";
+    push @filter_vars, $filter{offset};
+  }
+  my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars );
 
   my (%non_empty_bins, @all_fields, @contents);