X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FWH.pm;h=f760f5e9b36ad7fb9b4abc465fb9141394bb2f90;hb=55049b816f1c78769b3bfe734f033340d5872900;hp=bf850fa30a82afbe7afdecc78c876f6a42199aeb;hpb=9d14fd7e7dc33f871b4a0841f85e8f0a347e9df0;p=kivitendo-erp.git

diff --git a/SL/WH.pm b/SL/WH.pm
index bf850fa30..f760f5e9b 100644
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -73,13 +73,15 @@ sub transfer {
     return;
   };
 
+  my @trans_ids;
+
   my $db = SL::DB::Inventory->new->db;
   $db->do_transaction(sub{
     while (my $transfer = shift @args) {
       my ($trans_id) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT nextval('id')|);
 
       my $part          = $objectify->($transfer, 'parts',         'SL::DB::Part');
-      my $unit          = $objectify->($transfer, 'unit',          'SL::DB::Unit',         unit => $transfer->{unit});
+      my $unit          = $objectify->($transfer, 'unit',          'SL::DB::Unit',         name => $transfer->{unit});
       my $qty           = $transfer->{qty};
       my $src_bin       = $objectify->($transfer, 'src_bin',       'SL::DB::Bin');
       my $dst_bin       = $objectify->($transfer, 'dst_bin',       'SL::DB::Bin');
@@ -109,7 +111,7 @@ sub transfer {
       );
 
       if ($unit) {
-        $qty *= $unit->factor;
+        $qty *= $unit->factor           || 1;
         $qty /= $part->unit_obj->factor || 1 if $part->unit;
       }
 
@@ -130,12 +132,16 @@ sub transfer {
           qty       => $qty,
         )->save;
       }
+
+      push @trans_ids, $trans_id;
     }
   }) or do {
     $::form->error("Warehouse transfer error: " . join("\n", (split(/\n/, $db->error))[0..2]));
   };
 
   $::lxdebug->leave_sub;
+
+  return @trans_ids;
 }
 
 sub transfer_assembly {
@@ -614,6 +620,11 @@ sub get_warehouse_report {
     push @filter_vars, '%' . $filter{ean} . '%';
   }
 
+  if ($filter{date}) {
+    push @filter_ary, "i.itime <= ?";
+    push @filter_vars, $filter{date};
+  }
+
   # prepare qty comparison for later filtering
   my ($f_qty_op, $f_qty, $f_qty_base_unit);