X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/229c0071b3edbab080c5d5de9ce67456ea4e0fd5..7cd6d451d97d1f1e7f3c0f9db2de03735dc8c8f0:/SL/RP.pm diff --git a/SL/RP.pm b/SL/RP.pm index e6aecd9eb..79f0403f2 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -1653,9 +1653,7 @@ sub bwa { keys %{ $form->{charts} }; $form->{"charts_by_category"} = \%charts_by_category; - # $main::lxdebug->dump(0, "charts_by_category", $form->{charts_by_category} ); - - $form->{category_names} = { selectall_as_map($form, $dbh, "select * from bwa_categories order by id", 'id', 'description') }; + $form->{category_names} = AM->get_bwa_categories($myconfig, $form); my @periods = qw(jetzt kumm); my @gesamtleistung = qw(1 3); @@ -1916,13 +1914,13 @@ sub erfolgsrechnung { foreach my $account (@{$category{accounts}}) { $account->{total} += get_total_ch($account->{id}, $fromdate, $todate); $category{total} += $account->{total}; - $account->{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $account->{total}), 2); + $account->{total} = $form->format_amount($myconfig, $form->round_amount($account->{total}, 2), 2); } $form->{total} += $category{total}; - $category{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $category{total}), 2); + $category{total} = $form->format_amount($myconfig, $form->round_amount($category{total}, 2), 2); push(@{$form->{categories}}, \%category); } - $form->{total} = $form->format_amount($myconfig, $form->parse_amount($myconfig, $form->{total}), 2); + $form->{total} = $form->format_amount($myconfig, $form->round_amount($form->{total}, 2), 2); $main::lxdebug->leave_sub(); return {};