X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FFinancialControllingReport.pm;h=bedc7623ff7bb3078bb58271a4ea44d4f6c97fb5;hb=32f83e8e1c88c04cd9a8686d8482b1473a9d73c5;hp=e57599aceb69bb503b39644b9662fbef8ba6bbe5;hpb=baab8c2f48e608af0566de78fd34e62f13173d66;p=kivitendo-erp.git diff --git a/SL/Controller/FinancialControllingReport.pm b/SL/Controller/FinancialControllingReport.pm index e57599ace..bedc7623f 100644 --- a/SL/Controller/FinancialControllingReport.pm +++ b/SL/Controller/FinancialControllingReport.pm @@ -8,32 +8,17 @@ use List::Util qw(sum); use SL::DB::Order; use SL::DB::ProjectType; use SL::Controller::Helper::GetModels; -use SL::Controller::Helper::Paginated; -use SL::Controller::Helper::Sorted; -use SL::Controller::Helper::ParseFilter; use SL::Controller::Helper::ReportGenerator; use SL::Locale::String; use Rose::Object::MakeMethods::Generic ( - scalar => [ qw(db_args flat_filter project_types) ], + scalar => [ qw(project_types) ], + 'scalar --get_set_init' => [ qw(models) ], ); __PACKAGE__->run_before(sub { $::auth->assert('sales_order_edit'); }); -__PACKAGE__->get_models_url_params('flat_filter'); -__PACKAGE__->make_paginated( - MODEL => 'Order', - PAGINATE_ARGS => 'db_args', - ONLY => [ qw(list) ], -); - -__PACKAGE__->make_sorted( - MODEL => 'Order', - ONLY => [ qw(list) ], - - DEFAULT_BY => 'globalprojectnumber', - DEFAULT_DIR => 1, - +my %sort_columns = ( ordnumber => t8('Order'), customer => t8('Customer'), transaction_description => t8('Transaction description'), @@ -47,13 +32,11 @@ sub action_list { $self->project_types(SL::DB::Manager::ProjectType->get_all_sorted); - $self->db_args($self->setup_db_args_for_list(filter => $::form->{filter})); - $self->flat_filter({ map { $_->{key} => $_->{value} } $::form->flatten_variables('filter') }); $self->make_filter_summary; $self->prepare_report; - $self->{orders} = $self->get_models(%{ $self->db_args }); + $self->{orders} = $self->models->get; $self->calculate_data; @@ -62,25 +45,6 @@ sub action_list { # private functions -sub setup_db_args_for_list { - my ($self) = @_; - - $self->{filter} = {}; - my %args = ( parse_filter($::form->{filter}, with_objects => [ 'customer', 'globalproject', 'globalproject.project_type' ], launder_to => $self->{filter})); - $args{query} = [ - @{ $args{query} || [] }, - SL::DB::Manager::Order->type_filter('sales_order'), - or => [ - globalproject_id => undef, - and => [ - 'globalproject.active' => 1, - 'globalproject.valid' => 1, - ]], - ]; - - return \%args; -} - sub prepare_report { my ($self) = @_; @@ -112,7 +76,7 @@ sub prepare_report { sub => sub { $_[0]->globalproject_id ? $_[0]->globalproject->project_type->description : '' } }, ); - map { $column_defs{$_}->{text} ||= $::locale->text( $self->get_sort_spec->{$_}->{title} ) } keys %column_defs; + map { $column_defs{$_}->{text} ||= $::locale->text( $self->models->get_sort_spec->{$_}->{title} ) } keys %column_defs; map { $column_defs{$_}->{align} = 'right' } @{ $self->{number_columns} }; $report->set_options( @@ -120,8 +84,6 @@ sub prepare_report { controller_class => 'FinancialControllingReport', output_format => 'HTML', top_info_text => $::locale->text('Financial controlling report for open sales orders'), - raw_top_info_text => $self->render('financial_controlling_report/report_top', { output => 0 }), - raw_bottom_info_text => $self->render('financial_controlling_report/report_bottom', { output => 0 }), title => $::locale->text('Financial Controlling Report'), allow_pdf_export => 1, allow_csv_export => 1, @@ -130,9 +92,13 @@ sub prepare_report { $report->set_column_order(@columns); $report->set_export_options(qw(list filter)); $report->set_options_from_form; - $self->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable); - - $self->disable_pagination if $report->{options}{output_format} =~ /^(pdf|csv)$/i; + $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i; + $self->models->finalize; + $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable); + $report->set_options( + raw_top_info_text => $self->render('financial_controlling_report/report_top', { output => 0 }), + raw_bottom_info_text => $self->render('financial_controlling_report/report_bottom', { output => 0 }, models => $self->models), + ); } sub calculate_data { @@ -166,9 +132,12 @@ sub sum_items { my %vals; foreach my $item (@{ $params{obj}->items }) { - $vals{$item->parts_id} ||= { parts_id => $item->parts_id, amount => 0, base_qty => 0 }; - $vals{$item->parts_id}->{amount} += $item->qty * $item->sellprice * (1 - $item->discount) / (($item->price_factor * 1) || 1); - $vals{$item->parts_id}->{base_qty} += $item->qty * $item->unit_obj->base_factor; + my $key = $item->parts_id; + $key .= ':' . $item->serialnumber if $item->serialnumber; + + $vals{$key} ||= { parts_id => $item->parts_id, serialnumber => $item->serialnumber, amount => 0, base_qty => 0 }; + $vals{$key}->{amount} += $item->qty * $item->sellprice * (1 - $item->discount) / (($item->price_factor * 1) || 1); + $vals{$key}->{base_qty} += $item->qty * $item->unit_obj->base_factor; } return \%vals; @@ -182,12 +151,19 @@ sub sum_relevant_items { my $total = 0; foreach my $item (grep { $params{order}->{amounts_by_parts_id}->{ $_->{parts_id} } } values %{ $sums }) { - my $order_item = $params{order}->{amounts_by_parts_id}->{ $item->{parts_id} }; - if ($params{by_order} && $order_item->{base_qty}) { - $total += $order_item->{amount} * $item->{base_qty} / $order_item->{base_qty}; - } else { - $total += $item->{amount}; + my $key = $item->{parts_id}; + + if ($params{by_order}) { + $key .= ':' . $item->{serialnumber}; + my $order_item = $params{order}->{amounts_by_parts_id}->{ $key } || $params{order}->{amounts_by_parts_id}->{ $item->{parts_id} }; + + if ($order_item && $order_item->{base_qty}) { + $total += $order_item->{amount} * $item->{base_qty} / $order_item->{base_qty}; + next; + } } + + $total += $item->{amount}; } return $total; @@ -221,6 +197,33 @@ sub make_filter_summary { $self->{filter_summary} = join ', ', @filter_strings; } +sub init_models { + my ($self) = @_; + + SL::Controller::Helper::GetModels->new( + controller => $self, + model => 'Order', + sorted => { + _default => { + by => 'globalprojectnumber', + dir => 1, + }, + %sort_columns, + }, + query => [ + SL::DB::Manager::Order->type_filter('sales_order'), + '!closed' => 1, + or => [ + globalproject_id => undef, + and => [ + 'globalproject.active' => 1, + 'globalproject.valid' => 1, + ]], + ], + with_objects => [ 'customer', 'globalproject', 'globalproject.project_type' ], + ); +} + sub link_to { my ($self, $object, %params) = @_;