Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 3f4f01dc

Von Moritz Bunkus vor mehr als 11 Jahren hinzugefügt

  • ID 3f4f01dcd306d7ebb51a1186d722e6aecd237003
  • Vorgänger 768b390e
  • Nachfolger f5c9c5eb

Buchungsjournal: Filter "Bearbeiter" gefixt

Behebt #2248.

Unterschiede anzeigen:

SL/GL.pm
285 285
    push(@apvalues, '%' . $form->{description} . '%');
286 286
  }
287 287

  
288
  if ($form->{employee} =~ /--/) {
289
    ($form->{employee_id},$form->{employee_name}) = split(/--/,$form->{employee});
290
  #if ($form->{employee_id}) {
288
  if ($form->{employee_id}) {
291 289
    $glwhere .= " AND g.employee_id = ? ";
292 290
    $arwhere .= " AND a.employee_id = ? ";
293 291
    $apwhere .= " AND a.employee_id = ? ";
bin/mozilla/gl.pl
304 304
  );
305 305

  
306 306
  # add employee here, so that variable is still known and passed in url when choosing a different sort order in resulting table
307
  my @hidden_variables = qw(accno source reference department description notes project_id datefrom dateto employee datesort category l_subtotal);
307
  my @hidden_variables = qw(accno source reference department description notes project_id datefrom dateto employee_id datesort category l_subtotal);
308 308
  push @hidden_variables, map { "l_${_}" } @columns;
309 309
  foreach ( @hidden_variables ) {
310 310
      print URL "$_\n";
311 311
  };
312 312

  
313
  my $employee = $form->{employee_id} ? SL::DB::Employee->new(id => $form->{employee_id})->load->name : '';
314

  
313 315
  my (@options, @date_options);
314 316
  push @options,      $locale->text('Account')     . " : $form->{accno} $form->{account_description}" if ($form->{accno});
315 317
  push @options,      $locale->text('Source')      . " : $form->{source}"                             if ($form->{source});
316 318
  push @options,      $locale->text('Reference')   . " : $form->{reference}"                          if ($form->{reference});
317 319
  push @options,      $locale->text('Description') . " : $form->{description}"                        if ($form->{description});
318 320
  push @options,      $locale->text('Notes')       . " : $form->{notes}"                              if ($form->{notes});
319
  push @options,      $locale->text('Employee')       . " : $form->{employee_name}"                              if ($form->{employee_name});
321
  push @options,      $locale->text('Employee')    . " : $employee"                                   if $employee;
320 322
  my $datesorttext = $form->{datesort} eq 'transdate' ? $locale->text('Invoice Date') :  $locale->text('Booking Date');
321 323
  push @date_options,      "$datesorttext"                              if ($form->{datesort} and ($form->{datefrom} or $form->{dateto}));
322 324
  push @date_options, $locale->text('From'), $locale->date(\%myconfig, $form->{datefrom}, 1)          if ($form->{datefrom});
templates/webpages/gl/search.html
42 42
        </tr>
43 43
 <tr>
44 44
    <th align=right>[% 'Employee' | $T8 %]</th>
45
    <td colspan=3>[% L.select_tag('employee', ALL_EMPLOYEES, title_key = 'safe_name', with_empty = 1) %]</td>
45
    <td colspan=3>[% L.select_tag('employee_id', ALL_EMPLOYEES, title_key = 'safe_name', with_empty = 1) %]</td>
46 46
  </tr>
47 47
  <tr>
48 48
    <th align=right>[% 'Filter date by' | $T8 %]</th>

Auch abrufbar als: Unified diff