X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FInventory.pm;h=8e5a445deec49154914cf96747440627d7cfba7f;hb=1b15807093421ca00493a447048b960f2f512152;hp=f3f29388d6925702950f9c2f090839e24b69b65b;hpb=446556531b74ff759a6ee6a338ff83325863a6d0;p=kivitendo-erp.git diff --git a/SL/Controller/Inventory.pm b/SL/Controller/Inventory.pm index f3f29388d..8e5a445de 100644 --- a/SL/Controller/Inventory.pm +++ b/SL/Controller/Inventory.pm @@ -44,28 +44,35 @@ sub action_stock_in { sub action_stock { my ($self) = @_; - # do stock - WH->transfer({ - parts => $self->part, - dst_bin => $self->bin, - dst_wh => $self->warehouse, - qty => $::form->format_amount(\%::myconfig, $::form->{qty}), - unit => $self->unit, - transfer_type => 'stock', - chargenumber => $::form->{chargenumber}, - ean => $::form->{ean}, - comment => $::form->{comment}, - }); - - 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; + my $qty = $::form->parse_amount(\%::myconfig, $::form->{qty}); + if (!$qty) { + flash_later('error', t8('Cannot stock without amount')); + } elsif ($qty < 0) { + flash_later('error', t8('Cannot stock negative amounts')); + } else { + # do stock + WH->transfer({ + parts => $self->part, + dst_bin => $self->bin, + dst_wh => $self->warehouse, + qty => $qty, + unit => $self->unit, + transfer_type => 'stock', + chargenumber => $::form->{chargenumber}, + ean => $::form->{ean}, + comment => $::form->{comment}, + }); + + 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; + } + + flash_later('info', t8('Transfer successful')); } - flash_later('info', t8('Transfer successful')); - # redirect $self->redirect_to( action => 'stock_in', @@ -236,7 +243,7 @@ sub show_no_warehouses_error { my $msg = t8('No warehouse has been created yet or the quantity of the bins is not configured yet.') . ' '; - if ($::auth->check_right($::form->{login}, 'config')) { # TODO wut? + if ($::auth->check_right($::myconfig{login}, 'config')) { # TODO wut? $msg .= t8('You can create warehouses and bins via the menu "System -> Warehouses".'); } else { $msg .= t8('Please ask your administrator to create warehouses and bins.');