Revision 2ccb1431
Von Cem Aydin vor mehr als 1 Jahr hinzugefügt
| SL/Controller/ListTransactions.pm | ||
|---|---|---|
| 237 | 237 |
|
| 238 | 238 |
# this data is used in custom header |
| 239 | 239 |
$self->{eb_value} = $::form->{beginning_balance};
|
| 240 |
$self->{saldo_old} += $::form->{beginning_balance};
|
|
| 241 |
$self->{debit_old} += $::form->{beginning_balance};
|
|
| 242 |
$self->{credit_old} += $::form->{beginning_balance};
|
|
| 240 |
$self->{saldo_old} = $::form->{saldo_old} + $::form->{beginning_balance};
|
|
| 241 |
# "Jahresverkehrszahlen alt" |
|
| 242 |
$self->{debit_old} = $::form->{old_balance_debit};
|
|
| 243 |
$self->{credit_old} = $::form->{old_balance_credit};
|
|
| 243 | 244 |
|
| 244 | 245 |
$self->set_report_custom_headers(); |
| 245 | 246 |
|
| ... | ... | |
| 327 | 328 |
$data{$_}->{align} = 'right' for qw(debit credit balance);
|
| 328 | 329 |
$self->report->add_data(\%data); |
| 329 | 330 |
|
| 331 |
# get data for the footer line from the CA->all_transactions request |
|
| 332 |
$self->{saldo_new} = $::form->{saldo_new} + $::form->{beginning_balance};
|
|
| 333 |
# "Jahresverkehrszahlen neu" |
|
| 334 |
$self->{debit_new} = $::form->{current_balance_debit};
|
|
| 335 |
$self->{credit_new} = $::form->{current_balance_credit};
|
|
| 336 |
|
|
| 330 | 337 |
$self->set_report_footer_lines(); |
| 331 | 338 |
} |
| 332 | 339 |
|
| ... | ... | |
| 342 | 349 |
# line 2 |
| 343 | 350 |
my %data2 = map { $_ => { class => 'listtotal' } } keys %{ $self->report->{columns} };
|
| 344 | 351 |
$data2{reference}->{data} = format_debit_credit($self->{eb_value});
|
| 345 |
$data2{description} = { data => format_debit_credit($self->{balance}), class => 'listtotal', colspan => 2 };
|
|
| 346 |
$data2{debit}->{data} = $::form->format_amount(\%::myconfig, abs($self->{total_debit}), 2) . " S";
|
|
| 347 |
$data2{credit}->{data} = $::form->format_amount(\%::myconfig, $self->{total_credit}, 2) . " H";
|
|
| 352 |
$data2{description} = { data => format_debit_credit($self->{saldo_new}), class => 'listtotal', colspan => 2 };
|
|
| 353 |
$data2{debit}->{data} = $::form->format_amount(\%::myconfig, abs($self->{debit_new}) , 2) . " S";
|
|
| 354 |
$data2{credit}->{data} = $::form->format_amount(\%::myconfig, $self->{credit_new}, 2) . " H";
|
|
| 348 | 355 |
$self->report->add_data(\%data2); |
| 349 | 356 |
} |
| 350 | 357 |
|
Auch abrufbar als: Unified diff
Fix #583: Buchungsliste: Saldo korrekt berechnen und für Jahresverkehrszahlen
korrekte Werte aus Datenbankabfrage verwenden (jeweils alt und neu)
- Bilanzwerte in Tabelle werden dadurch auch korrekt berechnet
Behebt Fehler #583.