use strict;
use parent qw(SL::Controller::Base);
-use List::Util qw(sum);
+use List::Util qw(max min sum);
use SL::DB::Order;
use SL::DB::ProjectType;
use SL::Locale::String;
use Rose::Object::MakeMethods::Generic (
- scalar => [ qw(project_types) ],
- 'scalar --get_set_init' => [ qw(models) ],
+ scalar => [ qw(orders) ],
+ 'scalar --get_set_init' => [ qw(project_types models) ],
);
__PACKAGE__->run_before(sub { $::auth->assert('sales_order_edit'); });
sub action_list {
my ($self) = @_;
- $self->project_types(SL::DB::Manager::ProjectType->get_all_sorted);
-
$self->make_filter_summary;
$self->prepare_report;
- $self->{orders} = $self->models->get;
+ $self->orders($self->models->get);
$self->calculate_data;
+ $self->setup_list_action_bar;
$self->list_objects;
}
my $report = SL::ReportGenerator->new(\%::myconfig, $::form);
$self->{report} = $report;
- my @columns = qw(customer globalprojectnumber globalproject_type ordnumber net_amount delivered_amount delivered_amount_p billed_amount billed_amount_p paid_amount paid_amount_p
+ my @columns = qw(customer globalprojectnumber globalproject_type transaction_description ordnumber net_amount 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 globalprojectnumber globalproject_type);
+ my @sortable = qw(ordnumber transdate customer globalprojectnumber globalproject_type transaction_description );
$self->{number_columns} = [ qw(net_amount 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 = (
billable_amount => { text => $::locale->text('Billable amount') },
billable_amount_p => { text => $::locale->text('%') },
other_amount => { text => $::locale->text('Billed extra expenses') },
+ transaction_description => { text => $::locale->text('Transaction description') },
ordnumber => { obj_link => sub { $self->link_to($_[0]) } },
customer => { sub => sub { $_[0]->customer->name },
obj_link => sub { $self->link_to($_[0]->customer) } },
sub => sub { $_[0]->globalproject_id ? $_[0]->globalproject->project_type->description : '' } },
);
- map { $column_defs{$_}->{text} ||= $::locale->text( $self->models->get_sort_spec->{$_}->{title} ) } keys %column_defs;
- map { $column_defs{$_}->{align} = 'right' } @{ $self->{number_columns} };
+ $column_defs{$_}->{text} ||= $::locale->text( $self->models->get_sort_spec->{$_}->{title} ) for keys %column_defs;
+ $column_defs{$_}->{align} = 'right' for @{ $self->{number_columns} };
$report->set_options(
std_column_visibility => 1,
sub calculate_data {
my ($self) = @_;
- foreach my $order (@{ $self->{orders} }) {
+ 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' ]) };
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->{delivered_amount} = sum(map { $self->sum_relevant_items(order => $order, other => $_, by_order => 1) } @delivery_orders) // 0;
+ $order->{billed_amount} = sum(map { $self->sum_relevant_items(order => $order, other => $_) } @invoices) // 0;
+ $order->{paid_amount} = sum(map { $_->paid * $_->netamount / (($_->amount * 1) || ($_->netamount * 1) || 1) } @invoices) // 0;
+ my $billed_amount = sum(map { $_->netamount } @invoices) // 0;
$order->{other_amount} = $billed_amount - $order->{billed_amount};
$order->{billable_amount} = $order->{delivered_amount} - $order->{billed_amount};
if ($order->periodic_invoices_config) {
- my @dates = $order->periodic_invoices_config->calculate_invoice_dates(past_dates => 1, end_date => $order->periodic_invoices_config->end_date || DateTime->today_local);
- $order->{net_amount} = $order->netamount * scalar(@dates);
+ $order->{net_amount} = $self->calculate_periodic_invoices_order_netamount($order);
} else {
$order->{net_amount} = $order->netamount;
}
}
+sub calculate_periodic_invoices_order_netamount {
+ my ($self, $order) = @_;
+
+ my $year = DateTime->today_local->year;
+ my $year_start = DateTime->new_local(day => 1, month => 1, year => $year);
+ my $year_end = DateTime->new_local(day => 31, month => 12, year => $year);
+
+ my $cfg = $order->periodic_invoices_config;
+ my $period_len = $cfg->get_billing_period_length;
+ my $num_months = 0;
+ my $cur_date = $cfg->start_date->clone;
+ my $end_date = $cfg->terminated ? $cfg->end_date : undef;
+ $end_date //= $year_end;
+ $end_date = min $end_date, $year_end;
+
+ while ($cur_date <= $end_date) {
+ $num_months += $period_len if $cur_date >= $year_start;
+ $cur_date->add(months => $period_len);
+ }
+
+ return $num_months * $order->netamount / $order->periodic_invoices_config->get_order_value_period_length;
+}
+
sub sum_items {
my ($self, %params) = @_;
my ($self) = @_;
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} };
+ $data->{$_}->{data} = defined $data->{$_}->{data} ? int($data->{$_}->{data}) : '' for grep { m/_p$/ } @{ $self->{number_columns} };
+ $data->{$_}->{data} = $::form->format_amount(\%::myconfig, $data->{$_}->{data}, 2) for grep { !m/_p$/ } @{ $self->{number_columns} };
};
- return $self->report_generator_list_objects(report => $self->{report}, objects => $self->{orders}, data_callback => $modify_data);
+ return $self->report_generator_list_objects(report => $self->{report}, objects => $self->orders, data_callback => $modify_data);
}
sub make_filter_summary {
$self->{filter_summary} = join ', ', @filter_strings;
}
+sub init_project_types { SL::DB::Manager::ProjectType->get_all_sorted }
+
sub init_models {
my ($self) = @_;
query => [
SL::DB::Manager::Order->type_filter('sales_order'),
'!closed' => 1,
+ (salesman_id => SL::DB::Manager::Employee->current->id) x !$::auth->assert('sales_all_edit', 1),
or => [
globalproject_id => undef,
and => [
# ]
],
],
- with_objects => [ 'customer', 'globalproject', 'globalproject.project_type' ],
+ with_objects => [ 'customer', 'globalproject', 'globalproject.project_type', 'periodic_invoices_config' ],
);
}
my $type = $object->type;
my $id = $object->id;
- return "oe.pl?action=$action&type=$type&vc=customer&id=$id";
+ if ($::instance_conf->get_feature_experimental_order) {
+ return "controller.pl?action=Order/$action&type=$type&id=$id";
+ } else {
+ return "oe.pl?action=$action&type=$type&vc=customer&id=$id";
+ }
}
if ($object->isa('SL::DB::Customer')) {
my $id = $object->id;
- return "ct.pl?action=$action&id=$id&db=customer";
+ return "controller.pl?action=CustomerVendor/$action&id=$id";
}
if ($object->isa('SL::DB::Project')) {
my $id = $object->id;
}
}
+sub setup_list_action_bar {
+ my ($self, %params) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Update'),
+ submit => [ '#filter_form', { action => 'FinancialControllingReport/list' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
1;