X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FProject.pm;h=b32fb8d2340d639dbe7f5f18776a7155f39121de;hb=70edaa5fe6a00edcd8a2abe7ea4ba06c7893f538;hp=fc72036ee050b9ddf70120e0269283e658cfc757;hpb=fac8417d136f89b1ce0fed8c2ef35ee089228ac7;p=kivitendo-erp.git diff --git a/SL/Controller/Project.pm b/SL/Controller/Project.pm index fc72036ee..b32fb8d23 100644 --- a/SL/Controller/Project.pm +++ b/SL/Controller/Project.pm @@ -117,8 +117,7 @@ sub action_ajax_autocomplete { my $exact_matches; if (1 == scalar @{ $exact_matches = SL::DB::Manager::Project->get_all( query => [ - obsolete => 0, - SL::DB::Manager::Project->type_filter($::form->{filter}{type}), + valid => 1, or => [ description => { ilike => $::form->{filter}{'all:substr:multi::ilike'} }, projectnumber => { ilike => $::form->{filter}{'all:substr:multi::ilike'} }, @@ -263,7 +262,8 @@ sub prepare_report { description => { obj_link => sub { $self->url_for(action => 'edit', id => $_[0]->id, callback => $callback) } }, project_type => { sub => sub { $_[0]->project_type->description } }, project_status => { sub => sub { $_[0]->project_status->description }, text => t8('Status') }, - customer => { raw_data => sub { $_[0]->customer_id ? $self->presenter->customer($_[0]->customer, display => 'table-cell', callback => $callback) : '' } }, + customer => { sub => sub { !$_[0]->customer_id ? '' : $_[0]->customer->name }, + raw_data => sub { !$_[0]->customer_id ? '' : $self->presenter->customer($_[0]->customer, display => 'table-cell', callback => $callback) } }, active => { sub => sub { $_[0]->active ? $::locale->text('Active') : $::locale->text('Inactive') }, text => $::locale->text('Active') }, valid => { sub => sub { $_[0]->valid ? $::locale->text('Valid') : $::locale->text('Invalid') },