Revision 84fedf96
Von Waldemar Toews vor fast 8 Jahren hinzugefügt
| SL/SEPA.pm | ||
|---|---|---|
| 316 | 316 |
'employee' => [ 'e.name', 'se.id', ], |
| 317 | 317 |
'executed' => [ 'se.executed', 'se.id', ], |
| 318 | 318 |
'closed' => [ 'se.closed', 'se.id', ], |
| 319 |
'sum_amounts' => [ 'sum_amounts', 'se.id', ], |
|
| 319 | 320 |
); |
| 320 | 321 |
|
| 321 | 322 |
my %sort_spec = create_sort_spec('defs' => \%sort_columns, 'default' => 'id', 'column' => $params{sortorder}, 'dir' => $params{sortdir});
|
| ... | ... | |
| 365 | 366 |
foreach my $dir (qw(from to)) {
|
| 366 | 367 |
next unless ($filter->{"${type}_date_${dir}"});
|
| 367 | 368 |
push @where_sub, "(items.${type}_date IS NOT NULL) AND (items.${type}_date $operators{$dir} ?)";
|
| 368 |
push @values_sub, $filter->{"${type}_date_${_}"};
|
|
| 369 |
push @values_sub, $filter->{"${type}_date_${dir}"};
|
|
| 369 | 370 |
} |
| 370 | 371 |
} |
| 371 | 372 |
|
| ... | ... | |
| 409 | 410 |
FROM employee emp |
| 410 | 411 |
) AS e ON (se.employee_id = e.id) |
| 411 | 412 |
$where |
| 413 |
GROUP BY se.id, se.employee_id, se.executed, se.closed, se.itime, e.name |
|
| 412 | 414 |
ORDER BY $sort_spec{sql}|;
|
| 413 | 415 |
|
| 414 | 416 |
my $results = selectall_hashref_query($form, $dbh, $query, @values); |
| bin/mozilla/sepa.pl | ||
|---|---|---|
| 269 | 269 |
my @columns = qw(selected id export_date employee executed closed num_invoices sum_amounts message_ids); |
| 270 | 270 |
my %column_alignment = map { ($_ => 'right') } qw(num_invoices sum_amounts);
|
| 271 | 271 |
|
| 272 |
foreach my $name (qw(id export_date employee executed closed)) {
|
|
| 272 |
foreach my $name (qw(id export_date employee executed closed sum_amounts)) {
|
|
| 273 | 273 |
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
|
| 274 | 274 |
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
|
| 275 | 275 |
} |
Auch abrufbar als: Unified diff
In der SEPA-Überweisungsliste fehlt die Spalte "Summe".
Im Bericht "Zahlungsverkehr -> Berichte -> Überweisungen via SEPA" die
Spalte "Summe" implementiert, welche die Summe aller Überweisungen im
jeweiligen SEPA-Export anzeigt. Den Bericht "Zahlungsverkehr ->
Berichte -> Bankeinzüge via SEPA" ist auch angepasst.