X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FInventory.pm;h=a0764abfdd6d48f8ab718b0254c06fa213af74ea;hb=4b04c42212bb045a98535fcc16eef4ad81b2dbb6;hp=0a41f0b7df470f565a851a95dbcb1f9509b87b4f;hpb=74a70e2abde806043aa9fa5a90ca47532b927a97;p=kivitendo-erp.git diff --git a/SL/Controller/Inventory.pm b/SL/Controller/Inventory.pm index 0a41f0b7d..a0764abfd 100644 --- a/SL/Controller/Inventory.pm +++ b/SL/Controller/Inventory.pm @@ -11,13 +11,12 @@ use SL::DB::Warehouse; use SL::DB::Unit; use SL::WH; use SL::Locale::String qw(t8); -use SL::ClientJS; use SL::Presenter; use SL::DBUtils; use SL::Helper::Flash; use Rose::Object::MakeMethods::Generic ( - 'scalar --get_set_init' => [ qw(warehouses units js p) ], + 'scalar --get_set_init' => [ qw(warehouses units p) ], 'scalar' => [ qw(warehouse bin unit part) ], ); @@ -59,6 +58,7 @@ sub action_stock { unit => $self->unit, transfer_type => 'stock', chargenumber => $::form->{chargenumber}, + bestbefore => $::form->{bestbefore}, ean => $::form->{ean}, comment => $::form->{comment}, }); @@ -99,7 +99,7 @@ sub action_part_changed { ->replaceWith('#bin_id', $self->build_bin_select) ->replaceWith('#unit_id', $self->build_unit_select) ->focus('#warehouse_id') - ->render($self); + ->render; } sub action_warehouse_changed { @@ -108,7 +108,7 @@ sub action_warehouse_changed { $self->js ->replaceWith('#bin_id', $self->build_bin_select) ->focus('#bin_id') - ->render($self); + ->render; } sub action_mini_stock { @@ -116,7 +116,7 @@ sub action_mini_stock { $self->js ->html('#stock', $self->render('inventory/_stock', { output => 0 })) - ->render($self); + ->render; } #================================================================ @@ -137,10 +137,6 @@ sub init_units { SL::DB::Manager::Unit->get_all; } -sub init_js { - SL::ClientJS->new; -} - sub init_p { SL::Presenter->get; } @@ -243,7 +239,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.');