Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[mfinanz.git] / SL / Controller / FinancialControllingReport.pm

diff --git a/SL/Controller/FinancialControllingReport.pm b/SL/Controller/FinancialControllingReport.pm
index d4492c1d977859f23441c718e6feb9cf78cb4a9c..bedc7623ff7bb3078bb58271a4ea44d4f6c97fb5 100644 (file)
--- a/SL/Controller/FinancialControllingReport.pm
+++ b/SL/Controller/FinancialControllingReport.pm
@@ -6,50 +6,37 @@ use parent qw(SL::Controller::Base);
 use List::Util qw(sum);
 
 use SL::DB::Order;
 use List::Util qw(sum);
 
 use SL::DB::Order;

+use SL::DB::ProjectType;

 use SL::Controller::Helper::GetModels;
 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 (
 use SL::Controller::Helper::ReportGenerator;
 use SL::Locale::String;
 
 use Rose::Object::MakeMethods::Generic (

-  scalar => [ qw(db_args flat_filter) ],
+  scalar => [ qw(project_types) ],
+  'scalar --get_set_init' => [ qw(models) ],

 );
 
 __PACKAGE__->run_before(sub { $::auth->assert('sales_order_edit'); });
 
 );
 
 __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'),
   globalprojectnumber     => t8('Project'),
   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) = @_;
 
   netamount               => t8('Order amount'),
 );
 
 sub action_list {
   my ($self) = @_;
 

-  $self->db_args($self->setup_db_args_for_list(filter => $::form->{filter}));
-  $self->flat_filter({ map { $_->{key} => $_->{value} } $::form->flatten_variables('filter') });
+  $self->project_types(SL::DB::Manager::ProjectType->get_all_sorted);
+

   $self->make_filter_summary;
 
   $self->prepare_report;
 
   $self->make_filter_summary;
 
   $self->prepare_report;
 

-  $self->{orders} = $self->get_models(%{ $self->db_args });
+  $self->{orders} = $self->models->get;

 
   $self->calculate_data;
 
 
   $self->calculate_data;
 


@@ -58,28 +45,15 @@ sub action_list {
 
 # private functions
 
 
 # private functions
 

-sub setup_db_args_for_list {
-  my ($self) = @_;
-
-  $self->{filter} = {};
-  my %args     = ( parse_filter($::form->{filter}, with_objects => [ 'customer', 'globalproject' ], launder_to => $self->{filter}));
-  $args{query} = [
-    @{ $args{query} || [] },
-    SL::DB::Manager::Order->type_filter('sales_order'),
-  ];
-
-  return \%args;
-}
-

 sub prepare_report {
   my ($self)      = @_;
 
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 
 sub prepare_report {
   my ($self)      = @_;
 
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 

-  my @columns     = qw(customer globalprojectnumber project_type ordnumber netamount delivered_amount delivered_amount_p billed_amount billed_amount_p paid_amount paid_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);
                        billable_amount billable_amount_p other_amount);

-  my @sortable    = qw(ordnumber transdate customer netamount globalprojectnumber);
+  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           = (
   $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           = (


@@ -96,12 +70,13 @@ sub prepare_report {
     ordnumber               => { obj_link => sub { $self->link_to($_[0])                                              }  },
     customer                => {      sub => sub { $_[0]->customer->name                                              },
                                  obj_link => sub { $self->link_to($_[0]->customer)                                    }  },
     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 : '' }  },
-    project_type            => { text     => $::locale->text('Project type'),
-                                 sub      => sub { $_[0]->globalproject_id ? $_[0]->globalproject->type          : '' }  },
+    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;
+  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(
   map { $column_defs{$_}->{align} = 'right' } @{ $self->{number_columns} };
 
   $report->set_options(


@@ -109,8 +84,6 @@ sub prepare_report {
     controller_class      => 'FinancialControllingReport',
     output_format         => 'HTML',
     top_info_text         => $::locale->text('Financial controlling report for open sales orders'),
     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 }),

     title                 => $::locale->text('Financial Controlling Report'),
     allow_pdf_export      => 1,
     allow_csv_export      => 1,
     title                 => $::locale->text('Financial Controlling Report'),
     allow_pdf_export      => 1,
     allow_csv_export      => 1,


@@ -119,27 +92,31 @@ sub prepare_report {
   $report->set_column_order(@columns);
   $report->set_export_options(qw(list filter));
   $report->set_options_from_form;
   $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->{report_data} = {
-    column_defs        => \%column_defs,
-    columns            => \@columns,
-  };
+  $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 {
   my ($self) = @_;
 
   foreach my $order (@{ $self->{orders} }) {
 }
 
 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->{other_amount}      = $billed_amount             - $order->{billed_amount};
     $order->{billable_amount}   = $order->{delivered_amount} - $order->{billed_amount};
 


@@ -155,9 +132,12 @@ sub sum_items {
   my %vals;
 
   foreach my $item (@{ $params{obj}->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;
   }
 
   return \%vals;


@@ -171,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 $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;
   }
 
   return $total;


@@ -184,25 +171,13 @@ sub sum_relevant_items {
 
 sub list_objects {
   my ($self)      = @_;
 
 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 {
 }
 
 sub make_filter_summary {


@@ -222,6 +197,33 @@ sub make_filter_summary {
   $self->{filter_summary} = join ', ', @filter_strings;
 }
 
   $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) = @_;
 
 sub link_to {
   my ($self, $object, %params) = @_;
 


@@ -238,6 +240,10 @@ sub link_to {
     my $id     = $object->id;
     return "ct.pl?action=$action&id=$id&db=customer";
   }
     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;
 }
 
 1;