X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FInventory.pm;h=a95efaddb0188a4bda21e5db971686b2bebb6774;hb=d4608fb4eff9392728d1287de4df3e865ebe7f6e;hp=3f406ee480b2876d2f3821f494b713572c45ef14;hpb=103612f3c8ede917cc8f3ed560e9f23cca31de2d;p=kivitendo-erp.git diff --git a/SL/Controller/Inventory.pm b/SL/Controller/Inventory.pm index 3f406ee48..a95efaddb 100644 --- a/SL/Controller/Inventory.pm +++ b/SL/Controller/Inventory.pm @@ -2,6 +2,7 @@ package SL::Controller::Inventory; use strict; use warnings; +use POSIX qw(strftime); use parent qw(SL::Controller::Base); @@ -10,14 +11,17 @@ use SL::DB::Part; use SL::DB::Warehouse; use SL::DB::Unit; use SL::WH; +use SL::ReportGenerator; use SL::Locale::String qw(t8); -use SL::ClientJS; use SL::Presenter; use SL::DBUtils; use SL::Helper::Flash; +use SL::Controller::Helper::ReportGenerator; + +use English qw(-no_match_vars); 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) ], ); @@ -29,7 +33,7 @@ __PACKAGE__->run_before('load_wh_from_form', only => [ qw(stock_in warehouse __PACKAGE__->run_before('load_bin_from_form', only => [ qw(stock_in stock) ]); __PACKAGE__->run_before('set_target_from_part', only => [ qw(part_changed) ]); __PACKAGE__->run_before('mini_stock', only => [ qw(stock_in mini_stock) ]); -__PACKAGE__->run_before('sanitize_target', only => [ qw(stock_in warehouse_changed part_changed) ]); +__PACKAGE__->run_before('sanitize_target', only => [ qw(stock_usage stock_in warehouse_changed part_changed) ]); __PACKAGE__->run_before('set_layout'); sub action_stock_in { @@ -38,33 +42,399 @@ sub action_stock_in { $::form->{title} = t8('Stock'); $::request->layout->focus('#part_id_name'); - $_[0]->render('inventory/warehouse_selection_stock', title => $::form->{title}); + my $transfer_types = WH->retrieve_transfer_types('in'); + map { $_->{description} = $main::locale->text($_->{description}) } @{ $transfer_types }; + $self->setup_stock_in_action_bar; + $self->render('inventory/warehouse_selection_stock', title => $::form->{title}, TRANSFER_TYPES => $transfer_types ); } -sub action_stock { +sub action_stock_usage { + my ($self) = @_; + + $::form->{title} = t8('UsageE'); + + $::form->get_lists('warehouses' => { 'key' => 'WAREHOUSES', + 'bins' => 'BINS', }); + $::request->layout->use_javascript("${_}.js") for qw(kivi.PartsWarehouse); + + $self->setup_stock_usage_action_bar; + $self->render('inventory/warehouse_usage', + title => $::form->{title}, + year => DateTime->today->year, + WAREHOUSES => $::form->{WAREHOUSES}, + WAREHOUSE_FILTER => 1, + warehouse_id => 0, + bin_id => 0 + ); + +} + +sub getnumcolumns { my ($self) = @_; + return qw(stock incorrection found insum back outcorrection disposed + missing shipped used outsum consumed averconsumed); +} + +sub action_usage { + my ($self) = @_; + + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + + $form->{title} = t8('UsageE'); + $form->{report_generator_output_format} = 'HTML' if !$form->{report_generator_output_format}; + + my $report = SL::ReportGenerator->new(\%myconfig, $form); + + my @columns = qw(partnumber partdescription); + + push @columns , qw(ptype unit) if $form->{report_generator_output_format} eq 'HTML'; + + my @numcolumns = qw(stock incorrection found insum back outcorrection disposed + missing shipped used outsum consumed averconsumed); + + push @columns , $self->getnumcolumns(); + + my @hidden_variables = qw(reporttype year duetyp fromdate todate + warehouse_id bin_id partnumber description bestbefore chargenumber partstypes_id); + my %column_defs = ( + 'partnumber' => { 'text' => $locale->text('Part Number'), }, + 'partdescription' => { 'text' => $locale->text('Part_br_Description'), }, + 'unit' => { 'text' => $locale->text('Unit'), }, + 'stock' => { 'text' => $locale->text('stock_br'), }, + 'incorrection' => { 'text' => $locale->text('correction_br'), }, + 'found' => { 'text' => $locale->text('found_br'), }, + 'insum' => { 'text' => $locale->text('sum'), }, + 'back' => { 'text' => $locale->text('back_br'), }, + 'outcorrection' => { 'text' => $locale->text('correction_br'), }, + 'disposed' => { 'text' => $locale->text('disposed_br'), }, + 'missing' => { 'text' => $locale->text('missing_br'), }, + 'shipped' => { 'text' => $locale->text('shipped_br'), }, + 'used' => { 'text' => $locale->text('used_br'), }, + 'outsum' => { 'text' => $locale->text('sum'), }, + 'consumed' => { 'text' => $locale->text('consumed'), }, + 'averconsumed' => { 'text' => $locale->text('averconsumed_br'), }, + ); + + + map { $column_defs{$_}->{visible} = 1 } @columns; + #map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns; + map { $column_defs{$_}->{align} = 'right' } @numcolumns; + + my @custom_headers = (); + # Zeile 1: + push @custom_headers, [ + { 'text' => $locale->text('Part'), + 'colspan' => ($form->{report_generator_output_format} eq 'HTML'?4:2), 'align' => 'center'}, + { 'text' => $locale->text('Into bin'), 'colspan' => 4, 'align' => 'center'}, + { 'text' => $locale->text('From bin'), 'colspan' => 7, 'align' => 'center'}, + { 'text' => $locale->text('UsageWithout'), 'colspan' => 2, 'align' => 'center'}, + ]; + + # Zeile 2: + my @line_2 = (); + map { push @line_2 , $column_defs{$_} } @columns; + push @custom_headers, [ @line_2 ]; + + $report->set_custom_headers(@custom_headers); + $report->set_columns( %column_defs ); + $report->set_column_order(@columns); + + $report->set_export_options('usage', @hidden_variables ); + + $report->set_sort_indicator($form->{sort}, $form->{order}); + $report->set_options('output_format' => 'HTML', + 'controller_class' => 'Inventory', + 'title' => $form->{title}, +# 'html_template' => 'inventory/usage_report', + 'attachment_basename' => strftime($locale->text('warehouse_usage_list') . '_%Y%m%d', localtime time)); + $report->set_options_from_form; + + my %searchparams ; +# form vars +# reporttype = custom +# year = 2014 +# duetyp = 7 + + my $start = DateTime->now_local; + my $end = DateTime->now_local; + my $actualepoch = $end->epoch(); + my $days = 365; + my $mdays=30; + $searchparams{reporttype} = $form->{reporttype}; + if ($form->{reporttype} eq "custom") { + my $smon = 1; + my $emon = 12; + my $sday = 1; + my $eday = 31; + #forgotten the year --> thisyear + if ($form->{year} !~ m/^\d\d\d\d$/) { + $locale->date(\%myconfig, $form->current_date(\%myconfig), 0) =~ + /(\d\d\d\d)/; + $form->{year} = $1; + } + my $leapday = ($form->{year} % 4 == 0) ? 1:0; + #yearly report + if ($form->{duetyp} eq "13") { + $days += $leapday; + } + + #Quater reports + if ($form->{duetyp} eq "A") { + $emon = 3; + $days = 90 + $leapday; + } + if ($form->{duetyp} eq "B") { + $smon = 4; + $emon = 6; + $eday = 30; + $days = 91; + } + if ($form->{duetyp} eq "C") { + $smon = 7; + $emon = 9; + $eday = 30; + $days = 92; + } + if ($form->{duetyp} eq "D") { + $smon = 10; + $days = 92; + } + #Monthly reports + if ($form->{duetyp} eq "1" || $form->{duetyp} eq "3" || $form->{duetyp} eq "5" || + $form->{duetyp} eq "7" || $form->{duetyp} eq "8" || $form->{duetyp} eq "10" || + $form->{duetyp} eq "12") { + $smon = $emon = $form->{duetyp}*1; + $mdays=$days = 31; + } + if ($form->{duetyp} eq "2" || $form->{duetyp} eq "4" || $form->{duetyp} eq "6" || + $form->{duetyp} eq "9" || $form->{duetyp} eq "11" ) { + $smon = $emon = $form->{duetyp}*1; + $eday = 30; + if ($form->{duetyp} eq "2" ) { + #this works from 1901 to 2099, 1900 and 2100 fail. + $eday = ($form->{year} % 4 == 0) ? 29 : 28; + } + $mdays=$days = $eday; + } + $searchparams{year} = $form->{year}; + $searchparams{duetyp} = $form->{duetyp}; + $start->set_month($smon); + $start->set_day($sday); + $start->set_year($form->{year}*1); + $end->set_month($emon); + $end->set_day($eday); + $end->set_year($form->{year}*1); + } else { + $searchparams{fromdate} = $form->{fromdate}; + $searchparams{todate} = $form->{todate}; +# reporttype = free +# fromdate = 01.01.2014 +# todate = 31.05.2014 + my ($yy, $mm, $dd) = $locale->parse_date(\%myconfig,$form->{fromdate}); + $start->set_year($yy); + $start->set_month($mm); + $start->set_day($dd); + ($yy, $mm, $dd) = $locale->parse_date(\%myconfig,$form->{todate}); + $end->set_year($yy); + $end->set_month($mm); + $end->set_day($dd); + my $dur = $start->delta_md($end); + $days = $dur->delta_months()*30 + $dur->delta_days() ; + } + $start->set_second(0); + $start->set_minute(0); + $start->set_hour(0); + $end->set_second(59); + $end->set_minute(59); + $end->set_hour(23); + if ( $end->epoch() > $actualepoch ) { + $end = DateTime->now_local; + my $dur = $start->delta_md($end); + $days = $dur->delta_months()*30 + $dur->delta_days() ; + } + if ( $start->epoch() > $end->epoch() ) { $start = $end;$days = 1;} + $days = $mdays if $days < $mdays; + #$main::lxdebug->message(LXDebug->DEBUG2(), "start=".$start->epoch()); + #$main::lxdebug->message(LXDebug->DEBUG2(), " end=".$end->epoch()); + #$main::lxdebug->message(LXDebug->DEBUG2(), " days=".$days); + my @andfilter = (shippingdate => { ge => $start }, shippingdate => { le => $end } ); + if ( $form->{warehouse_id} ) { + push @andfilter , ( warehouse_id => $form->{warehouse_id}); + $searchparams{warehouse_id} = $form->{warehouse_id}; + if ( $form->{bin_id} ) { + push @andfilter , ( bin_id => $form->{bin_id}); + $searchparams{bin_id} = $form->{bin_id}; + } + } + # alias class t2 entspricht parts + if ( $form->{partnumber} ) { + push @andfilter , ( 't2.partnumber' => { ilike => '%'. $form->{partnumber} .'%' }); + $searchparams{partnumber} = $form->{partnumber}; + } + if ( $form->{description} ) { + push @andfilter , ( 't2.description' => { ilike => '%'. $form->{description} .'%' }); + $searchparams{description} = $form->{description}; + } + if ( $form->{bestbefore} ) { + push @andfilter , ( bestbefore => { eq => $form->{bestbefore} }); + $searchparams{bestbefore} = $form->{bestbefore}; + } + if ( $form->{chargenumber} ) { + push @andfilter , ( chargenumber => { ilike => '%'.$form->{chargenumber}.'%' }); + $searchparams{chargenumber} = $form->{chargenumber}; + } + if ( $form->{partstypes_id} ) { + push @andfilter , ( 't2.partstypes_id' => $form->{partstypes_id} ); + $searchparams{partstypes_id} = $form->{partstypes_id}; + } + + my @filter = (and => [ @andfilter ] ); + + my $objs = SL::DB::Manager::Inventory->get_all(with_objects => ['parts'], where => [ @filter ] , sort_by => 'parts.partnumber ASC'); + #my $objs = SL::DB::Inventory->_get_manager_class->get_all(...); + + # manual paginating, yuck + my $page = $::form->{page} || 1; + my $pages = {}; + $pages->{per_page} = $::form->{per_page} || 20; + my $first_nr = ($page - 1) * $pages->{per_page}; + my $last_nr = $first_nr + $pages->{per_page}; + + my $last_partid = 0; + my $last_row = { }; + my $row_ind = 0; + my $allrows = 0; + $allrows = 1 if $form->{report_generator_output_format} ne 'HTML' ; + #$main::lxdebug->message(LXDebug->DEBUG2(), "first_nr=".$first_nr." last_nr=".$last_nr); + foreach my $entry (@{ $objs } ) { + if ( $entry->parts_id != $last_partid ) { + if ( $last_partid > 0 ) { + if ( $allrows || ($row_ind >= $first_nr && $row_ind < $last_nr )) { + $self->make_row_result($last_row,$days,$last_partid); + $report->add_data($last_row); + } + $row_ind++ ; + } + $last_partid = $entry->parts_id; + $last_row = { }; + $last_row->{partnumber}->{data} = $entry->part->partnumber; + $last_row->{partdescription}->{data} = $entry->part->description; + $last_row->{unit}->{data} = $entry->part->unit; + $last_row->{stock}->{data} = 0; + $last_row->{incorrection}->{data} = 0; + $last_row->{found}->{data} = 0; + $last_row->{back}->{data} = 0; + $last_row->{outcorrection}->{data} = 0; + $last_row->{disposed}->{data} = 0; + $last_row->{missing}->{data} = 0; + $last_row->{shipped}->{data} = 0; + $last_row->{used}->{data} = 0; + $last_row->{insum}->{data} = 0; + $last_row->{outsum}->{data} = 0; + $last_row->{consumed}->{data} = 0; + $last_row->{averconsumed}->{data} = 0; + } + if ( !$allrows && $row_ind >= $last_nr ) { + next; + } + my $prefix=''; + if ( $entry->trans_type->description eq 'correction' ) { + $prefix = $entry->trans_type->direction; + } + $last_row->{$prefix.$entry->trans_type->description}->{data} += + ( $entry->trans_type->direction eq 'out' ? -$entry->qty : $entry->qty ); + } + if ( $last_partid > 0 && ( $allrows || ($row_ind >= $first_nr && $row_ind < $last_nr ))) { + $self->make_row_result($last_row,$days,$last_partid); + $report->add_data($last_row); + $row_ind++ ; + } + my $num_rows = @{ $report->{data} } ; + #$main::lxdebug->message(LXDebug->DEBUG2(), "count=".$row_ind." rows=".$num_rows); + + if ( ! $allrows ) { + $pages->{max} = SL::DB::Helper::Paginated::ceil($row_ind, $pages->{per_page}) || 1; + $pages->{page} = $page < 1 ? 1: $page > $pages->{max} ? $pages->{max}: $page; + $pages->{common} = [ grep { $_->{visible} } @{ SL::DB::Helper::Paginated::make_common_pages($pages->{page}, $pages->{max}) } ]; + $self->{pages} = $pages; + $searchparams{action} = "usage"; + $self->{base_url} = $self->url_for(\%searchparams ); + #$main::lxdebug->message(LXDebug->DEBUG2(), "page=".$pages->{page}." url=".$self->{base_url}); + + $report->set_options('raw_bottom_info_text' => $self->render('inventory/report_bottom', { output => 0 }) ); + } + $report->generate_with_headers(); + + $main::lxdebug->leave_sub(); - # do stock - WH->transfer({ - parts => $self->part, - dst_bin => $self->bin, - dst_wh => $self->warehouse, - qty => $::form->parse_amount(\%::myconfig, $::form->{qty}), - unit => $self->unit, - transfer_type => 'stock', - chargenumber => $::form->{chargenumber}, - ean => $::form->{ean}, - comment => $::form->{comment}, - }); +} + +sub make_row_result { + my ($self,$row,$days,$partid) = @_; + my $form = $main::form; + my $myconfig = \%main::myconfig; + + $row->{insum}->{data} = $row->{stock}->{data} + $row->{incorrection}->{data} + $row->{found}->{data}; + $row->{outsum}->{data} = $row->{back}->{data} + $row->{outcorrection}->{data} + $row->{disposed}->{data} + + $row->{missing}->{data} + $row->{shipped}->{data} + $row->{used}->{data}; + $row->{consumed}->{data} = $row->{outsum}->{data} - + $row->{outcorrection}->{data} - $row->{incorrection}->{data}; + $row->{averconsumed}->{data} = $row->{consumed}->{data}*30/$days ; + map { $row->{$_}->{data} = $form->format_amount($myconfig,$row->{$_}->{data},2); } $self->getnumcolumns(); + $row->{partnumber}->{link} = 'controller.pl?action=Part/edit&part.id' . $partid; +} - 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; +sub action_stock { + my ($self) = @_; + + my $transfer_error; + my $qty = $::form->parse_amount(\%::myconfig, $::form->{qty}); + if (!$qty) { + $transfer_error = t8('Cannot stock without amount'); + } elsif ($qty < 0) { + $transfer_error = t8('Cannot stock negative amounts'); + } else { + # do stock + $::form->throw_on_error(sub { + eval { + WH->transfer({ + parts => $self->part, + dst_bin => $self->bin, + dst_wh => $self->warehouse, + qty => $qty, + unit => $self->unit, + transfer_type => 'stock', + chargenumber => $::form->{chargenumber}, + bestbefore => $::form->{bestbefore}, + ean => $::form->{ean}, + comment => $::form->{comment}, + }); + 1; + } or do { $transfer_error = $EVAL_ERROR->getMessage; } + }); + + if (!$transfer_error) { + 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')); + my %additional_redirect_params = (); + if ($transfer_error) { + flash_later('error', $transfer_error); + $additional_redirect_params{$_} = $::form->{$_} for qw(qty chargenumber bestbefore ean comment); + $additional_redirect_params{qty} = $qty; + } # redirect $self->redirect_to( @@ -73,6 +443,7 @@ sub action_stock { bin_id => $self->bin->id, warehouse_id => $self->warehouse->id, unit_id => $self->unit->id, + %additional_redirect_params, ); } @@ -92,7 +463,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 { @@ -101,7 +472,7 @@ sub action_warehouse_changed { $self->js ->replaceWith('#bin_id', $self->build_bin_select) ->focus('#bin_id') - ->render($self); + ->render; } sub action_mini_stock { @@ -109,7 +480,7 @@ sub action_mini_stock { $self->js ->html('#stock', $self->render('inventory/_stock', { output => 0 })) - ->render($self); + ->render; } #================================================================ @@ -126,14 +497,14 @@ sub init_warehouses { SL::DB::Manager::Warehouse->get_all(query => [ or => [ invalid => 0, invalid => undef ]]); } +#sub init_bins { +# SL::DB::Manager::Bin->get_all(); +#} + sub init_units { SL::DB::Manager::Unit->get_all; } -sub init_js { - SL::ClientJS->new; -} - sub init_p { SL::Presenter->get; } @@ -152,6 +523,14 @@ sub sanitize_target { $self->warehouse($self->warehouses->[0]) if !$self->warehouse || !$self->warehouse->id; $self->bin ($self->warehouse->bins->[0]) if !$self->bin || !$self->bin->id; +# foreach my $warehouse ( $self->warehouses ) { +# $warehouse->{BINS} = []; +# foreach my $bin ( $self->bins ) { +# if ( $bin->warehouse_id == $warehouse->id ) { +# push @{ $warehouse->{BINS} }, $bin; +# } +# } +# } } sub load_part_from_form { @@ -236,7 +615,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.'); @@ -244,4 +623,88 @@ sub show_no_warehouses_error { $::form->show_generic_error($msg); } +sub setup_stock_in_action_bar { + my ($self, %params) = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Stock'), + submit => [ '#form', { action => 'Inventory/stock' } ], + checks => [ 'check_part_selection_before_stocking' ], + accesskey => 'enter', + ], + ); + } +} + +sub setup_stock_usage_action_bar { + my ($self, %params) = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Show'), + submit => [ '#form', { action => 'Inventory/usage' } ], + accesskey => 'enter', + ], + ); + } +} + 1; +__END__ + +=encoding utf-8 + +=head1 NAME + +SL::Controller::Inventory - Report Controller for inventory + +=head1 DESCRIPTION + +This controller makes three reports about inventory in warehouses/stocks + +- warehouse content + +- warehouse journal + +- warehouse withdrawal + +=head1 FUNCTIONS + +=over 4 + +=item C + +Create a search form for stock withdrawal. +The search parameter for report are made like the reports in bin/mozilla/rp.pl + +=item C + +Make a report about stock withdrawal. + +The manual pagination is implemented like the pagination in SL::Controller::CsvImport. + +=back + +=head1 SPECIAL CASES + +Because of the PFD-Table Formatter some parameters for PDF must be different to the HTML parameters. +So in german language there are some tries to use a HTML Break in the second heading line +to produce two line heading inside table. The actual version has some abbreviations for the header texts. + +=head1 BUGS + +The PDF-Table library has some limits (doesn't display all if the line is to large) so +the format is adapted to this + + +=head1 AUTHOR + +only for C and C: + +Martin Helmling Emartin.helmling@opendynamic.deE + + +=cut