X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FManager%2FProject.pm;h=2cc50f2780e4e7d77fa3da2c6e6ca48d7437fa19;hb=2271551b46c84fa256c7a2e0a46c04cddf31e89e;hp=6c5563fe7f2d441b83e6e11b72c2c5c72da8661c;hpb=71e2b75e559e40e0dc7126cecf46584b5a7ad5dd;p=kivitendo-erp.git diff --git a/SL/DB/Manager/Project.pm b/SL/DB/Manager/Project.pm index 6c5563fe7..2cc50f278 100644 --- a/SL/DB/Manager/Project.pm +++ b/SL/DB/Manager/Project.pm @@ -27,9 +27,13 @@ __PACKAGE__->add_filter_specs( }, status => sub { my ($key, $value, $prefix) = @_; - return () if $value eq 'all'; + return () if $value ne 'orphaned'; return __PACKAGE__->is_not_used_filter($prefix); }, + all => sub { + my ($key, $value, $prefix) = @_; + return or => [ map { $prefix . $_ => $value } qw(projectnumber description customer.name) ] + } ); our %project_id_column_prefixes = ( @@ -43,10 +47,13 @@ our @tables_with_project_id_cols = qw(acc_trans ap ar delivery_order_items deliv sub _sort_spec { return ( - default => [ 'projectnumber', 1 ], - columns => { - SIMPLE => 'ALL', - customer => 'customer.name', + default => [ 'projectnumber', 1 ], + columns => { + SIMPLE => 'ALL', + customer => 'customer.name', + project_type => 'project_type.description', + project_status => 'project_status.description', + customer_and_description => [ qw(customer.name project.description) ], }); }