Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 7518d312

Von Bernd Bleßmann vor etwa 3 Jahren hinzugefügt

  • ID 7518d312655994a0e61da547cfe7580fa96d5b36
  • Vorgänger fdb3de69
  • Nachfolger a2ce032d

Zeiterfassung: Eingabemaske und Bericht: Reihenfolge erst Projekt, dann Artikel

Unterschiede anzeigen:

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

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

  
245 245
  my %column_defs = (
246 246
    date         => { text => t8('Date'),         sub => sub { $_[0]->date_as_date },
templates/webpages/time_recording/form.html
24 24
       [%- END %]
25 25
        <th>[% 'Sales Order' | $T8 %]</th>
26 26
        <th>[% 'Customer' | $T8 %]</th>
27
        <th>[% 'Article' | $T8 %]</th>
28 27
        <th>[% 'Project' | $T8 %]</th>
28
        <th>[% 'Article' | $T8 %]</th>
29 29
        <th>[% 'Description' | $T8 %]</th>
30 30
        <th>[% 'Mitarbeiter' | $T8 %]</th>
31 31
      </tr>
......
53 53
       [%- END %]
54 54
        <td>[% P.select_tag('time_recording.order_id', SELF.all_orders, default=SELF.time_recording.order_id, title_key='digest', with_empty=1, onchange='kivi.TimeRecording.order_changed(this.value)') %]</td>
55 55
        <td>[% P.customer_vendor.picker('time_recording.customer_id', SELF.time_recording.customer_id, type='customer', style='width: 300px', "data-validate"="required", "data-title"=LxERP.t8('Customer')) %]</td>
56
        <td>[% P.select_tag('time_recording.part_id', SELF.all_time_recording_articles, default=SELF.time_recording.part_id, with_empty=1, value_key='id', title_key='description') %]</td>
57 56
        <td>[% P.project.picker('time_recording.project_id', SELF.time_recording.project_id, style='width: 300px') %]</td>
57
        <td>[% P.select_tag('time_recording.part_id', SELF.all_time_recording_articles, default=SELF.time_recording.part_id, with_empty=1, value_key='id', title_key='description') %]</td>
58 58
        <td>[% L.textarea_tag('time_recording.description', SELF.time_recording.description, wrap="soft", style="width: 350px; height: 150px", class="texteditor", "data-validate"="required", "data-title"=LxERP.t8('Description')) %]</td>
59 59
        <td>
60 60
          [%- IF SELF.can_edit_all -%]

Auch abrufbar als: Unified diff