X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/0c298dbf1e299f5e1d2eb7241536540ec045372d..7a452195542fca0d82b74763fbc1eb97770d60a6:/SL/Controller/FinancialControllingReport.pm diff --git a/SL/Controller/FinancialControllingReport.pm b/SL/Controller/FinancialControllingReport.pm index eab060a15..165a649c7 100644 --- a/SL/Controller/FinancialControllingReport.pm +++ b/SL/Controller/FinancialControllingReport.pm @@ -6,6 +6,7 @@ use parent qw(SL::Controller::Base); 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; @@ -14,7 +15,7 @@ use SL::Controller::Helper::ReportGenerator; use SL::Locale::String; use Rose::Object::MakeMethods::Generic ( - scalar => [ qw(db_args flat_filter) ], + scalar => [ qw(db_args flat_filter project_types) ], ); __PACKAGE__->run_before(sub { $::auth->assert('sales_order_edit'); }); @@ -30,20 +31,22 @@ __PACKAGE__->make_sorted( MODEL => 'Order', ONLY => [ qw(list) ], - DEFAULT_BY => 'transdate', + DEFAULT_BY => 'globalprojectnumber', DEFAULT_DIR => 1, - transdate => t8('Order Date'), ordnumber => t8('Order'), customer => t8('Customer'), transaction_description => t8('Transaction description'), globalprojectnumber => t8('Project'), + globalproject_type => t8('Project Type'), netamount => t8('Order amount'), ); sub action_list { my ($self) = @_; + $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; @@ -63,7 +66,7 @@ sub setup_db_args_for_list { my ($self) = @_; $self->{filter} = {}; - my %args = ( parse_filter($::form->{filter}, with_objects => [ 'customer', 'globalproject' ], launder_to => $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'), @@ -78,13 +81,12 @@ sub prepare_report { my $report = SL::ReportGenerator->new(\%::myconfig, $::form); $self->{report} = $report; - my @columns = qw(customer globalprojectnumber ordnumber transdate netamount delivered_amount delivered_amount_p billed_amount billed_amount_p paid_amount paid_amount_p - billable_amount billable_amount_p other_amount open_amount transaction_description); - my @sortable = qw(ordnumber transdate customer netamount globalprojectnumber); - $self->{number_columns} = [ qw(netamount billed_amount billed_amount_p delivered_amount delivered_amount_p paid_amount paid_amount_p open_amount other_amount billable_amount billable_amount_p) ]; + my @columns = qw(customer globalprojectnumber globalproject_type ordnumber netamount delivered_amount delivered_amount_p billed_amount billed_amount_p paid_amount paid_amount_p + billable_amount billable_amount_p other_amount); + my @sortable = qw(ordnumber transdate customer netamount globalprojectnumber globalproject_type); + $self->{number_columns} = [ qw(netamount billed_amount billed_amount_p delivered_amount delivered_amount_p paid_amount paid_amount_p other_amount billable_amount billable_amount_p) ]; my %column_defs = ( - transdate => { sub => sub { $_[0]->transdate_as_date } }, netamount => { }, billed_amount => { text => $::locale->text('Billed amount') }, billed_amount_p => { text => $::locale->text('%') }, @@ -94,13 +96,14 @@ sub prepare_report { paid_amount_p => { text => $::locale->text('%') }, billable_amount => { text => $::locale->text('Billable amount') }, billable_amount_p => { text => $::locale->text('%') }, - open_amount => { text => $::locale->text('Bills receivable') }, other_amount => { text => $::locale->text('Billed extra expenses') }, - transaction_description => { }, ordnumber => { obj_link => sub { $self->link_to($_[0]) } }, customer => { sub => sub { $_[0]->customer->name }, obj_link => sub { $self->link_to($_[0]->customer) } }, - globalprojectnumber => { sub => sub { $_[0]->globalproject_id ? $_[0]->globalproject->projectnumber : '' } }, + globalprojectnumber => { sub => sub { $_[0]->globalproject_id ? $_[0]->globalproject->projectnumber : '' }, + obj_link => sub { $self->link_to($_[0]->globalproject) } }, + globalproject_type => { text => $::locale->text('Project type'), + sub => sub { $_[0]->globalproject_id ? $_[0]->globalproject->project_type->description : '' } }, ); map { $column_defs{$_}->{text} ||= $::locale->text( $self->get_sort_spec->{$_}->{title} ) } keys %column_defs; @@ -108,7 +111,7 @@ sub prepare_report { $report->set_options( std_column_visibility => 1, - controller_class => 'FinancialControlling', + 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', { no_output => 1, partial => 1 }), @@ -135,16 +138,20 @@ sub calculate_data { my ($self) = @_; foreach my $order (@{ $self->{orders} }) { - my $delivery_orders = $order->linked_records(direction => 'to', to => 'DeliveryOrder', via => 'Order', query => [ '!customer_id' => undef ]); - my $invoices = $order->linked_records(direction => 'to', to => 'Invoice', via => [ 'Order', 'DeliveryOrder' ]); - - $order->{delivered_amount} = sum map { $self->sum_relevant_items(order => $order, other => $_, by_order => 1) } @{ $delivery_orders }; - $order->{billed_amount} = sum map { $self->sum_relevant_items(order => $order, other => $_) } @{ $invoices }; - $order->{paid_amount} = sum map { $_->paid } @{ $invoices }; - my $billed_amount = sum map { $_->netamount } @{ $invoices }; + my @delivery_orders = @{ $order->linked_records(direction => 'to', to => 'DeliveryOrder', via => 'Order', query => [ '!customer_id' => undef ]) }; + my @invoices = @{ $order->linked_records(direction => 'to', to => 'Invoice', via => [ 'Order', 'DeliveryOrder' ]) }; + + @invoices = ( + grep({ !$_->storno_id } @invoices), + map({ @{ $_->storno_invoices } } grep { $_->storno && !$_->storno_id } @invoices), + ); + + $order->{delivered_amount} = sum map { $self->sum_relevant_items(order => $order, other => $_, by_order => 1) } @delivery_orders; + $order->{billed_amount} = sum map { $self->sum_relevant_items(order => $order, other => $_) } @invoices; + $order->{paid_amount} = sum map { $_->paid * $_->netamount / (($_->amount * 1) || ($_->netamount * 1) || 1) } @invoices; + my $billed_amount = sum map { $_->netamount } @invoices; $order->{other_amount} = $billed_amount - $order->{billed_amount}; $order->{billable_amount} = $order->{delivered_amount} - $order->{billed_amount}; - $order->{open_amount} = $billed_amount - $order->{paid_amount }; foreach (qw(delivered billed paid billable)) { $order->{"${_}_amount_p"} = $order->netamount * 1 ? $order->{"${_}_amount"} * 100 / $order->netamount : undef; @@ -182,11 +189,6 @@ sub sum_relevant_items { } } - if (!$params{by_order} && ($params{order}->ordnumber =~ m/4$/)) { - $::lxdebug->dump(0, "obj @ $total", $sums); - $::lxdebug->dump(0, "ord", $params{order}->{amounts_by_parts_id}); - } - return $total; } @@ -246,6 +248,10 @@ sub link_to { my $id = $object->id; return "ct.pl?action=$action&id=$id&db=customer"; } + if ($object->isa('SL::DB::Project')) { + my $id = $object->id; + return "controller.pl?action=Project/$action&id=$id"; + } } 1;