GuV/BWA Splitfaktor richtig coalescen.

[kivitendo-erp.git] / SL / WH.pm

diff --git a/SL/WH.pm b/SL/WH.pm
index 352ca1af889b3ecd250d98ff2f6de0bedf632170..cc53427c50a378cc3f87a53aa2594c29b1ea9185 100644 (file)
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -115,6 +115,8 @@ sub transfer {
         $qty /= $part->unit_obj->factor || 1 if $part->unit;
       }
 
+      $params{chargenumber} ||= '';
+
       if ($direction & 1) {
         SL::DB::Inventory->new(
           %params,
@@ -620,6 +622,14 @@ sub get_warehouse_report {
     push @filter_vars, '%' . $filter{ean} . '%';
   }
 
+  if ($filter{date}) {
+    push @filter_ary, "i.itime <= ?";
+    push @filter_vars, $filter{date};
+  }
+  if (!$filter{include_invalid_warehouses}){
+    push @filter_ary,  "NOT (w.invalid)";
+  }
+
   # prepare qty comparison for later filtering
   my ($f_qty_op, $f_qty, $f_qty_base_unit);