X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FSellPriceInformation.pm;h=f31f53e281972b6878afca2225490127f065e031;hb=d3160c04203753f81f6a8ce5321997b726312caf;hp=d82f6670775fd7efc4bef652265e0ff5d3e62356;hpb=217751aba9f1e746f67914e83bb669fc784d6eac;p=kivitendo-erp.git

diff --git a/SL/Controller/SellPriceInformation.pm b/SL/Controller/SellPriceInformation.pm
index d82f66707..f31f53e28 100644
--- a/SL/Controller/SellPriceInformation.pm
+++ b/SL/Controller/SellPriceInformation.pm
@@ -32,9 +32,9 @@ sub action_list {
     db_args => $db_args,
   );
 
-  $self->{orderitems} = SL::DB::Manager::OrderItem->get_all(%$db_args);
+  my $orderitems = SL::DB::Manager::OrderItem->get_all(%$db_args);
 
-  $self->list_objects;
+  $self->report_generator_list_objects(report => $self->{report}, objects => $orderitems, options => { no_layout => 1 });
 }
 
 # private functions
@@ -68,7 +68,7 @@ sub column_defs {
     transdate   => { text => $::locale->text('Date'),
                       sub => sub { $_[0]->order->transdate_as_date }},
     ordnumber   => { text => $::locale->text('Number'),
-                      sub => sub { $_[0]->order->ordnumber },
+                      sub => sub { $_[0]->order->number },
                  obj_link => sub { $self->link_to($_[0]->order) }},
     customer    => { text => $::locale->text('Customer'),
                       sub => sub { $_[0]->order->customer->name },
@@ -115,7 +115,7 @@ sub prepare_report {
   $report->set_columns(%$column_defs);
   $report->set_column_order(@columns);
   $report->set_options(allow_pdf_export => 0, allow_csv_export => 0);
-  $report->set_sort_indicator(%params);
+  $report->set_sort_indicator($self->{sort_by}, $self->{sort_dir});
   $report->set_export_options(@{ $params{report_generator_export_options} || [] });
   $report->set_options(
     %{ $params{report_generator_options} || {} },
@@ -124,32 +124,6 @@ sub prepare_report {
     title                => $::locale->text('Sales Price information'),
   );
   $report->set_options_from_form;
-
-  $self->{report_data} = {
-    column_defs => $column_defs,
-    columns     => \@columns,
-    visible     => \@visible,
-    sortable    => \@sortable,
-  };
-}
-
-sub list_objects {
-  my ($self) = @_;
-  my $column_defs = $self->{report_data}{column_defs};
-  for my $obj (@{ $self->{orderitems} || [] }) {
-    $self->{report}->add_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} || {} }
-    });
-  }
-
-  return $self->{report}->generate_with_headers;
 }
 
 sub link_to {