}
# do not overwrite staff member if you do not have the right
- delete $attributes{staff_member_id} if !$_[0]->can_edit_all;
- $attributes{staff_member_id} = SL::DB::Manager::Employee->current->id if $is_new;
+ delete $attributes{staff_member_id} if !$_[0]->can_edit_all;
+ $attributes{staff_member_id} ||= SL::DB::Manager::Employee->current->id if $is_new;
- $attributes{employee_id} = SL::DB::Manager::Employee->current->id;
+ $attributes{employee_id} = SL::DB::Manager::Employee->current->id;
$time_recording->assign_attributes(%attributes);
order => { text => t8('Sales Order'), sub => sub { $_[0]->order && $_[0]->order->number } },
customer => { text => t8('Customer'), sub => sub { $_[0]->customer->displayable_name } },
part => { text => t8('Article'), sub => sub { $_[0]->part && $_[0]->part->displayable_name } },
- project => { text => t8('Project'), sub => sub { $_[0]->project && $_[0]->project->displayable_name } },
+ project => { text => t8('Project'), sub => sub { $_[0]->project && $_[0]->project->full_description(sytle => 'both') } },
description => { text => t8('Description'), sub => sub { $_[0]->description_as_stripped_html },
raw_data => sub { $_[0]->description_as_restricted_html }, # raw_data only used for html(?)
obj_link => sub { $self->url_for(action => 'edit', 'id' => $_[0]->id, callback => $self->models->get_callback) } },
my $filter = $::form->{filter} || {};
my @filter_strings;
- my $staff_member = $filter->{staff_member_id} ? SL::DB::Employee->new(id => $filter->{staff_member_id})->load->safe_name : '';
+ my $staff_member = $filter->{staff_member_id} ? SL::DB::Employee->new(id => $filter->{staff_member_id})->load->safe_name : '';
+ my $project = $filter->{project_id} ? SL::DB::Project->new (id => $filter->{project_id}) ->load->full_description(sytle => 'both') : '';
my @filters = (
- [ $filter->{"date:date::ge"}, t8('From Date') ],
- [ $filter->{"date:date::le"}, t8('To Date') ],
+ [ $filter->{"date:date::ge"}, t8('From Date') ],
+ [ $filter->{"date:date::le"}, t8('To Date') ],
[ $filter->{"customer"}->{"name:substr::ilike"}, t8('Customer') ],
[ $filter->{"customer"}->{"customernumber:substr::ilike"}, t8('Customer Number') ],
+ [ $filter->{"order"}->{"ordnumber:substr::ilike"}, t8('Order Number') ],
+ [ $project, t8('Project') ],
+ [ $filter->{"description:substr::ilike"}, t8('Description') ],
[ $staff_member, t8('Mitarbeiter') ],
);