Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[kivitendo-erp.git] / bin / mozilla / ca.pl

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index da3bfb0..4bef1d2 100644 (file)
--- 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,7 +153,7 @@ sub list {
   $::lxdebug->enter_sub;
   $::auth->assert('report');
 
-  $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}";
+  $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}" . " - " . $::form->{description};
 
   $::form->header;
   print $::form->parse_html_template('ca/list', {
@@ -186,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');
 
@@ -331,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);