Revision c49684f8
Von Bernd Bleßmann vor fast 3 Jahren hinzugefügt
| bin/mozilla/gl.pl | ||
|---|---|---|
| 428 | 428 |
|
| 429 | 429 |
my @columns = qw( |
| 430 | 430 |
transdate gldate id reference description |
| 431 |
notes source doccnt debit debit_accno |
|
| 431 |
notes transaction_description source doccnt debit debit_accno
|
|
| 432 | 432 |
credit credit_accno debit_tax debit_tax_accno |
| 433 | 433 |
credit_tax credit_tax_accno balance projectnumbers |
| 434 | 434 |
department employee |
| 435 | 435 |
); |
| 436 | 436 |
|
| 437 | 437 |
# add employee here, so that variable is still known and passed in url when choosing a different sort order in resulting table |
| 438 |
my @hidden_variables = qw(accno source reference description notes project_id datefrom dateto employee_id datesort category l_subtotal department_id); |
|
| 438 |
my @hidden_variables = qw(accno source reference description notes project_id datefrom dateto employee_id datesort category l_subtotal department_id transaction_description);
|
|
| 439 | 439 |
push @hidden_variables, map { "l_${_}" } @columns;
|
| 440 | 440 |
|
| 441 | 441 |
my $employee = $form->{employee_id} ? SL::DB::Employee->new(id => $form->{employee_id})->load->name : '';
|
| ... | ... | |
| 446 | 446 |
push @options, $locale->text('Reference') . " : $form->{reference}" if ($form->{reference});
|
| 447 | 447 |
push @options, $locale->text('Description') . " : $form->{description}" if ($form->{description});
|
| 448 | 448 |
push @options, $locale->text('Notes') . " : $form->{notes}" if ($form->{notes});
|
| 449 |
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if $form->{transaction_description};
|
|
| 449 | 450 |
push @options, $locale->text('Employee') . " : $employee" if $employee;
|
| 450 | 451 |
my $datesorttext = $form->{datesort} eq 'transdate' ? $locale->text('Transdate') : $locale->text('Gldate');
|
| 451 | 452 |
push @date_options, "$datesorttext" if ($form->{datesort} and ($form->{datefrom} or $form->{dateto}));
|
| ... | ... | |
| 492 | 493 |
'projectnumbers' => { 'text' => $locale->text('Project Numbers'), },
|
| 493 | 494 |
'department' => { 'text' => $locale->text('Department'), },
|
| 494 | 495 |
'employee' => { 'text' => $locale->text('Employee'), },
|
| 496 |
'transaction_description' => { 'text' => $locale->text('Transaction description'), },
|
|
| 495 | 497 |
); |
| 496 | 498 |
|
| 497 |
foreach my $name (qw(id transdate gldate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno department)) {
|
|
| 499 |
foreach my $name (qw(id transdate gldate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno department transaction_description)) {
|
|
| 498 | 500 |
my $sortname = $name =~ m/accno/ ? 'accno' : $name; |
| 499 | 501 |
my $sortdir = $sortname eq $form->{sort} ? 1 - $form->{sortdir} : $form->{sortdir};
|
| 500 | 502 |
$column_defs{$name}->{link} = $callback . "&sort=$sortname&sortdir=$sortdir";
|
| ... | ... | |
| 582 | 584 |
$row->{balance}->{data} = $data;
|
| 583 | 585 |
$row->{projectnumbers}->{data} = join ", ", sort { lc($a) cmp lc($b) } keys %{ $ref->{projectnumbers} };
|
| 584 | 586 |
|
| 585 |
map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes gldate employee department);
|
|
| 587 |
map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes gldate employee department transaction_description);
|
|
| 586 | 588 |
|
| 587 | 589 |
map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno source);
|
| 588 | 590 |
|
Auch abrufbar als: Unified diff
Buchungsjournal: Vorgangsbezeichnung anzeigen und danach filtern können