Chartpicker auch für Steuerzonen und Buchungsgruppen

[kivitendo-erp.git] / SL / Controller / DeliveryPlan.pm

diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm
index 8d2417eb568b6b658ff76ec3639faeabe6a77fcd..411a9940eae3044ed45cb5fd63c40b81cd3ea081 100644 (file)
--- a/SL/Controller/DeliveryPlan.pm
+++ b/SL/Controller/DeliveryPlan.pm
@@ -13,7 +13,7 @@ use Carp;
 
 use Rose::Object::MakeMethods::Generic (
   scalar => [ qw(db_args flat_filter) ],
 
 use Rose::Object::MakeMethods::Generic (
   scalar => [ qw(db_args flat_filter) ],

-  'scalar --get_set_init' => [ qw(models all_edit_right mode vc all_employees) ],
+  'scalar --get_set_init' => [ qw(models all_edit_right mode vc all_employees all_businesses) ],

 );
 
 __PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); });
 );
 
 __PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); });


@@ -40,7 +40,6 @@ sub action_list {
   $self->prepare_report;
 
   my $orderitems = $self->models->get;
   $self->prepare_report;
 
   my $orderitems = $self->models->get;

-  $self->{all_businesses} = SL::DB::Manager::Business->get_all_sorted;

 
   $self->report_generator_list_objects(report => $self->{report}, objects => $orderitems);
 }
 
   $self->report_generator_list_objects(report => $self->{report}, objects => $orderitems);
 }


@@ -120,12 +119,13 @@ sub make_filter_summary {
   my ($self) = @_;
   my $vc     = $self->vc;
   my $mode   = $self->mode;
   my ($self) = @_;
   my $vc     = $self->vc;
   my $mode   = $self->mode;

+  my ($business, $employee);

 
   my $filter = $::form->{filter} || {};
   my @filter_strings;
 
 
   my $filter = $::form->{filter} || {};
   my @filter_strings;
 

-  my $business = SL::DB::Business->new(id => $filter->{order}{customer}{"business_id"})->load->description if $filter->{order}{customer}{"business_id"};
-  my $employee = SL::DB::Employee->new(id => $filter->{order}{employee_id})->load->name if $filter->{order}{employee_id};
+  $business = SL::DB::Business->new(id => $filter->{order}{customer}{"business_id"})->load->description if $filter->{order}{customer}{"business_id"};
+  $employee = SL::DB::Employee->new(id => $filter->{order}{employee_id})->load->name if $filter->{order}{employee_id};

 
   my @filters = (
     [ $filter->{order}{"ordnumber:substr::ilike"},                    $::locale->text('Number')                                             ],
 
   my @filters = (
     [ $filter->{order}{"ordnumber:substr::ilike"},                    $::locale->text('Number')                                             ],


@@ -306,6 +306,9 @@ sub init_mode {
 sub init_all_employees {
   return SL::DB::Manager::Employee->get_all_sorted;
 }
 sub init_all_employees {
   return SL::DB::Manager::Employee->get_all_sorted;
 }

+sub init_all_businesses {
+  return SL::DB::Manager::Business->get_all_sorted;
+}

 sub link_to {
   my ($self, $object, %params) = @_;
 
 sub link_to {
   my ($self, $object, %params) = @_;