Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d4444522

Von Bernd Bleßmann vor mehr als 3 Jahren hinzugefügt

  • ID d4444522ac9e91799a092c904a7a88c77fa38ecf
  • Vorgänger bab432f4
  • Nachfolger 5b67a0b8

Zeiterfassung: Auftrag im Bericht anzeigen

Unterschiede anzeigen:

SL/Controller/TimeRecording.pm
35 35
  date         => t8('Date'),
36 36
  start_time   => t8('Start'),
37 37
  end_time     => t8('End'),
38
  order        => t8('Sales Order'),
38 39
  customer     => t8('Customer'),
39 40
  part         => t8('Article'),
40 41
  project      => t8('Project'),
......
189 190
    sorted         => \%sort_columns,
190 191
    disable_plugin => 'paginated',
191 192
    query          => \@where,
192
    with_objects   => [ 'customer', 'part', 'project', 'staff_member', 'employee' ],
193
    with_objects   => [ 'customer', 'part', 'project', 'staff_member', 'employee', 'order' ],
193 194
  );
194 195
}
195 196

  
......
239 240
  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
240 241
  $self->{report} = $report;
241 242

  
242
  my @columns  = qw(date start_time end_time customer part project description staff_member duration booked);
243
  my @columns  = qw(date start_time end_time order customer part project description staff_member duration booked);
243 244

  
244 245
  my %column_defs = (
245 246
    date         => { text => t8('Date'),         sub => sub { $_[0]->date_as_date },
......
248 249
                      obj_link => sub { $self->url_for(action => 'edit', 'id' => $_[0]->id, callback => $self->models->get_callback) }  },
249 250
    end_time     => { text => t8('End'),          sub => sub { $_[0]->end_time_as_timestamp },
250 251
                      obj_link => sub { $self->url_for(action => 'edit', 'id' => $_[0]->id, callback => $self->models->get_callback) }  },
252
    order        => { text => t8('Sales Order'),  sub => sub { $_[0]->order && $_[0]->order->number } },
251 253
    customer     => { text => t8('Customer'),     sub => sub { $_[0]->customer->displayable_name } },
252 254
    part         => { text => t8('Article'),      sub => sub { $_[0]->part && $_[0]->part->displayable_name } },
253 255
    project      => { text => t8('Project'),      sub => sub { $_[0]->project && $_[0]->project->displayable_name } },
SL/DB/Manager/TimeRecording.pm
25 25
                        start_time => [ 'date', 'start_time' ],
26 26
                        end_time   => [ 'date', 'end_time' ],
27 27
                        customer   => [ 'lower(customer.name)', 'date','start_time'],
28
                        order      => [ 'order.ordnumber', 'date','start_time'],
28 29
           }
29 30
  );
30 31
}

Auch abrufbar als: Unified diff