X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fca.pl;h=774da855a9c37c3449e74d35dbe2cfa4719e968e;hb=08e48f66590f580cbe2c8e3df76883d88b4c0fef;hp=af6c6c8241e4de3eda394d9d2abd174cfcf22432;hpb=7b108151efc32199f7d3feb2662348b2b07e2cb2;p=kivitendo-erp.git

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index af6c6c824..774da855a 100644
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -24,7 +24,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
 #======================================================================
 #
 # module for Chart of Accounts, Income Statement and Balance Sheet
@@ -35,6 +36,7 @@
 use POSIX qw(strftime);
 
 use SL::CA;
+use SL::DB::Default;
 use SL::ReportGenerator;
 
 require "bin/mozilla/reportgenerator.pl";
@@ -152,17 +154,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 +188,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 +334,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);