X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FInventory.pm;h=3f406ee480b2876d2f3821f494b713572c45ef14;hb=09619b3bc445ac9872ed0776293bc673f5b6f68d;hp=88c24fbb841d9322301efd48061536a1a0a48ef3;hpb=5f543a5e090f24b33854c4f0f64dae1674276cd6;p=kivitendo-erp.git

diff --git a/SL/Controller/Inventory.pm b/SL/Controller/Inventory.pm
index 88c24fbb8..3f406ee48 100644
--- a/SL/Controller/Inventory.pm
+++ b/SL/Controller/Inventory.pm
@@ -49,7 +49,7 @@ sub action_stock {
     parts         => $self->part,
     dst_bin       => $self->bin,
     dst_wh        => $self->warehouse,
-    qty           => $::form->format_amount(\%::myconfig, $::form->{qty}),
+    qty           => $::form->parse_amount(\%::myconfig, $::form->{qty}),
     unit          => $self->unit,
     transfer_type => 'stock',
     chargenumber  => $::form->{chargenumber},
@@ -58,6 +58,7 @@ sub action_stock {
   });
 
   if ($::form->{write_default_bin}) {
+    $self->part->load;   # onhand is calculated in between. don't mess that up
     $self->part->bin($self->bin);
     $self->part->warehouse($self->warehouse);
     $self->part->save;
@@ -71,6 +72,7 @@ sub action_stock {
     part_id      => $self->part->id,
     bin_id       => $self->bin->id,
     warehouse_id => $self->warehouse->id,
+    unit_id      => $self->unit->id,
   );
 }
 
@@ -121,7 +123,7 @@ sub _check_warehouses {
 }
 
 sub init_warehouses {
-  SL::DB::Manager::Warehouse->get_all;
+  SL::DB::Manager::Warehouse->get_all(query => [ or => [ invalid => 0, invalid => undef ]]);
 }
 
 sub init_units {
@@ -148,8 +150,8 @@ sub set_target_from_part {
 sub sanitize_target {
   my ($self) = @_;
 
-  $self->warehouse(SL::DB::Manager::Warehouse->get_first) if !$self->warehouse || !$self->warehouse->id;
-  $self->bin      ($self->warehouse->bins->[0])           if !$self->bin       || !$self->bin->id;
+  $self->warehouse($self->warehouses->[0])       if !$self->warehouse || !$self->warehouse->id;
+  $self->bin      ($self->warehouse->bins->[0])  if !$self->bin       || !$self->bin->id;
 }
 
 sub load_part_from_form {
@@ -229,7 +231,7 @@ sub mini_stock {
   $self->{stock_empty}  = ! grep { $_->{sum} * 1 } @$stock;
 }
 
-sub show_no_warehouse_error {
+sub show_no_warehouses_error {
   my ($self) = @_;
 
   my $msg = t8('No warehouse has been created yet or the quantity of the bins is not configured yet.') . ' ';