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

diff --git a/SL/Controller/TimeRecording.pm b/SL/Controller/TimeRecording.pm
index 6e0493b..aba6ff5 100644 (file)
--- a/SL/Controller/TimeRecording.pm
+++ b/SL/Controller/TimeRecording.pm
@@ -240,7 +240,7 @@ sub prepare_report {
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 
-  my @columns  = qw(date start_time end_time order customer part project description staff_member duration booked);
+  my @columns  = qw(date start_time end_time order customer project part description staff_member duration booked);
 
   my %column_defs = (
     date         => { text => t8('Date'),         sub => sub { $_[0]->date_as_date },

diff --git a/templates/webpages/time_recording/form.html b/templates/webpages/time_recording/form.html
index 7c2e3d5..59c47fc 100644 (file)
--- a/templates/webpages/time_recording/form.html
+++ b/templates/webpages/time_recording/form.html
@@ -24,8 +24,8 @@
        [%- END %]
         <th>[% 'Sales Order' | $T8 %]</th>
         <th>[% 'Customer' | $T8 %]</th>
-        <th>[% 'Article' | $T8 %]</th>
         <th>[% 'Project' | $T8 %]</th>
+        <th>[% 'Article' | $T8 %]</th>
         <th>[% 'Description' | $T8 %]</th>
         <th>[% 'Mitarbeiter' | $T8 %]</th>
       </tr>
@@ -53,8 +53,8 @@
        [%- END %]
         <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>
         <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>
-        <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>
         <td>[% P.project.picker('time_recording.project_id', SELF.time_recording.project_id, style='width: 300px') %]</td>
+        <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>
         <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>
         <td>
           [%- IF SELF.can_edit_all -%]