X-Git-Url: http://wagnertech.de/git?p=kivitendo-erp.git;a=blobdiff_plain;f=SL%2FController%2FDeliveryValueReport.pm;fp=SL%2FController%2FDeliveryValueReport.pm;h=ae2032fccb4d9e160057b744a99401fe72908671;hp=5fa5c454d99a78c92cd77c3aff8b68c458ed3198;hb=b293ff8ad52fc76ba0c44783e3982418114d6b08;hpb=d4925a8b60f04674885e30d9316dc0263f8b9a84 diff --git a/SL/Controller/DeliveryValueReport.pm b/SL/Controller/DeliveryValueReport.pm index 5fa5c454d..ae2032fcc 100644 --- a/SL/Controller/DeliveryValueReport.pm +++ b/SL/Controller/DeliveryValueReport.pm @@ -17,7 +17,7 @@ use Carp; use Data::Dumper; use Rose::Object::MakeMethods::Generic ( - 'scalar --get_set_init' => [ qw(models vc all_employees all_businesses) ], + 'scalar --get_set_init' => [ qw(models vc all_employees all_businesses all_partsgroups) ], ); __PACKAGE__->run_before(sub { $::auth->assert('delivery_value_report'); }); @@ -141,13 +141,14 @@ sub prepare_report { sub make_filter_summary { my ($self) = @_; my $vc = $self->vc; - my ($business, $employee); + my ($business, $employee, $partsgroup); my $filter = $::form->{filter} || {}; my @filter_strings; - $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}; + $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}; + $partsgroup = SL::DB::PartsGroup->new(id => $filter->{part}{partsgroup_id})->load->partsgroup if $filter->{part}{partsgroup_id}; my @filters = ( [ $filter->{order}{"ordnumber:substr::ilike"}, $::locale->text('Number') ], @@ -163,6 +164,7 @@ sub make_filter_summary { [ $filter->{order}{customer}{"customernumber:substr::ilike"}, $::locale->text('Customer Number') ], [ $business, $::locale->text('Customer type') ], [ $employee, $::locale->text('Employee') ], + [ $partsgroup, $::locale->text('Partsgroup') ], ); # flags for with_object 'part' @@ -217,6 +219,9 @@ sub init_all_employees { sub init_all_businesses { return SL::DB::Manager::Business->get_all_sorted; } +sub init_all_partsgroups { + return SL::DB::Manager::PartsGroup->get_all_sorted; +} sub link_to {