X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fca.pl;h=4bef1d2ee147c0fa1ce7e3920659f8433ba2094a;hb=049e49fea3e4a3c7c78d7aebf055936b3cab40c5;hp=af6c6c8241e4de3eda394d9d2abd174cfcf22432;hpb=c707edd523dc852f3bd11008d64ab3cb1daca545;p=kivitendo-erp.git diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index af6c6c824..4bef1d2ee 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -35,6 +35,7 @@ use POSIX qw(strftime); use SL::CA; +use SL::DB::Default; use SL::ReportGenerator; require "bin/mozilla/reportgenerator.pl"; @@ -152,17 +153,11 @@ sub list { $::lxdebug->enter_sub; $::auth->assert('report'); - $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}"; - - my $onload = qq|focus()|; - $onload .= qq|;setupDateFormat('$::myconfig{dateformat}', '|. $::locale->text("Falsches Datumsformat!") .qq|')|; - $onload .= qq|;setupPoints('$::myconfig{numberformat}', '|. $::locale->text("wrongformat") .qq|')|; + $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}" . " - " . $::form->{description}; $::form->header; print $::form->parse_html_template('ca/list', { - onload => $onload, year => DateTime->today->year, - cash => $::instance_conf->get_accounting_method eq 'cash', }); $::lxdebug->leave_sub; @@ -192,6 +187,7 @@ sub list_transactions { my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; + my $defaults = SL::DB::Default->get; $main::auth->assert('report'); @@ -337,7 +333,7 @@ sub list_transactions { $form->{print_date} = $locale->text('Create Date') . " " . $locale->date(\%myconfig, $form->current_date(\%myconfig), 0); push (@options, $form->{print_date}); - $form->{company} = $locale->text('Company') . " " . $myconfig{company}; + $form->{company} = $locale->text('Company') . " " . $defaults->company; push (@options, $form->{company}); my @columns = qw(transdate reference description gegenkonto debit credit ustkonto ustrate balance);