$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;
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 }),
- raw_bottom_info_text => $self->render('financial_controlling_report/report_bottom', { no_output => 1, partial => 1 }),
+ 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,
$self->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
$self->disable_pagination if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
-
- $self->{report_data} = {
- column_defs => \%column_defs,
- columns => \@columns,
- };
}
sub calculate_data {
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->{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;
+ my $billed_amount = sum map { $_->netamount } @invoices;
$order->{other_amount} = $billed_amount - $order->{billed_amount};
$order->{billable_amount} = $order->{delivered_amount} - $order->{billed_amount};
sub list_objects {
my ($self) = @_;
- my $column_defs = $self->{report_data}->{column_defs};
-
- for my $obj (@{ $self->{orders} || [] }) {
- my %data = map {
- $_ => {
- data => $column_defs->{$_}{sub} ? $column_defs->{$_}{sub}->($obj)
- : $obj->can($_) ? $obj->$_
- : $obj->{$_},
- link => $column_defs->{$_}{obj_link} ? $column_defs->{$_}{obj_link}->($obj) : '',
- },
- } @{ $self->{report_data}{columns} || {} };
-
- map { $data{$_}->{data} = defined $data{$_}->{data} ? int($data{$_}->{data}) : '' } grep { m/_p$/ } @{ $self->{number_columns} };
- map { $data{$_}->{data} = $::form->format_amount(\%::myconfig, $data{$_}->{data}, 2) } grep { !m/_p$/ } @{ $self->{number_columns} };
-
- $self->{report}->add_data(\%data);
- }
+ my $modify_data = sub {
+ my ($data) = @_;
+ map { $data->{$_}->{data} = defined $data->{$_}->{data} ? int($data->{$_}->{data}) : '' } grep { m/_p$/ } @{ $self->{number_columns} };
+ map { $data->{$_}->{data} = $::form->format_amount(\%::myconfig, $data->{$_}->{data}, 2) } grep { !m/_p$/ } @{ $self->{number_columns} };
+ };
- return $self->{report}->generate_with_headers;
+ return $self->report_generator_list_objects(report => $self->{report}, objects => $self->{orders}, data_callback => $modify_data);
}
sub make_filter_summary {