Bugfix für Bug 1127. webpages/ct/get_delivery_master ist nicht customer/vendor sicher...

[mfinanz.git] / SL / WH.pm

diff --git a/SL/WH.pm b/SL/WH.pm
index 51c27c976ccc298fe6c93c20aee4954416ad0e13..91ac127076c94916f542da34254f284e522f8b0e 100644 (file)
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -467,7 +467,7 @@ sub get_warehouse_report {
   my $dbh = $form->get_standard_dbh($myconfig);
 
   # filters
   my $dbh = $form->get_standard_dbh($myconfig);
 
   # filters

-  my (@filter_ary, @filter_vars, @wh_bin_filter_ary, @wh_bin_filter_vars, $columns, $group_by);
+  my (@filter_ary, @filter_vars, @wh_bin_filter_ary, @wh_bin_filter_vars);

 
   delete $form->{include_empty_bins} unless ($form->{l_warehousedescription} || $form->{l_bindescription});
 
 
   delete $form->{include_empty_bins} unless ($form->{l_warehousedescription} || $form->{l_bindescription});
 


@@ -569,14 +569,13 @@ sub get_warehouse_report {
 
   my $query =
     qq|SELECT $select_clause
 
   my $query =
     qq|SELECT $select_clause

-      $columns

       FROM inventory i
       LEFT JOIN parts     p ON i.parts_id     = p.id
       LEFT JOIN bin       b ON i.bin_id       = b.id
       LEFT JOIN warehouse w ON i.warehouse_id = w.id
       $joins
       WHERE $where_clause
       FROM inventory i
       LEFT JOIN parts     p ON i.parts_id     = p.id
       LEFT JOIN bin       b ON i.bin_id       = b.id
       LEFT JOIN warehouse w ON i.warehouse_id = w.id
       $joins
       WHERE $where_clause

-      GROUP BY $group_clause $group_by
+      GROUP BY $group_clause

       ORDER BY $sort_spec|;
 
   my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars);
       ORDER BY $sort_spec|;
 
   my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars);


@@ -603,7 +602,7 @@ sub get_warehouse_report {
       @all_fields                    = keys %{ $ref } unless (@all_fields);
     }
 
       @all_fields                    = keys %{ $ref } unless (@all_fields);
     }
 

-    $ref->{stock_value} *= $ref->{qty};
+    $ref->{stock_value} = ($ref->{stock_value} || 0) * $ref->{qty};

 
     push @contents, $ref;
   }
 
     push @contents, $ref;
   }