Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp

diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm
index c63a8ee..c79ceec 100644 (file)
--- a/SL/Controller/Base.pm
+++ b/SL/Controller/Base.pm
@@ -55,7 +55,7 @@ sub render {
       my $content_type  = $options->{type} eq 'js' ? 'text/javascript' : 'text/html';
 
       print $::form->create_http_response(content_type => $content_type,
-                                          charset      => $::dbcharset || Common::DEFAULT_CHARSET);
+                                          charset      => $::dbcharset || Common::DEFAULT_CHARSET());
 
     } else {
       $::form->{title} = $locals{title} if $locals{title};

diff --git a/SL/MoreCommon.pm b/SL/MoreCommon.pm
index 8f64861..048e3ec 100644 (file)
--- a/SL/MoreCommon.pm
+++ b/SL/MoreCommon.pm
@@ -207,8 +207,6 @@ will modify the input arrays.
 As cross expects an array but returns a list it is not directly chainable
 at the moment. This will be corrected in the future.
 
-=back
-
 =item ary_to_hash INDEX_KEY, VALUE_KEY, ARRAY
 
 Returns a hash with the content of ARRAY based on the values of

diff --git a/SL/Printer.pm b/SL/Printer.pm
index ed42b01..5ed072d 100644 (file)
--- a/SL/Printer.pm
+++ b/SL/Printer.pm
@@ -1,5 +1,7 @@
 package SL::Printer;
 
+use strict;
+
 use SL::DBUtils;
 
 sub all_printers {

diff --git a/bin/mozilla/bankaccounts.pl b/bin/mozilla/bankaccounts.pl
index f8bbb3a..3155e25 100644 (file)
--- a/bin/mozilla/bankaccounts.pl
+++ b/bin/mozilla/bankaccounts.pl
@@ -126,7 +126,7 @@ sub bank_account_list {
                        'attachment_basename'   => $locale->text('bankaccounts') . strftime('_%Y%m%d', localtime time),
     );
   $report->set_options_from_form();
-  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
+  $locale->set_numberformat_wo_thousands_separator(\%::myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);

diff --git a/bin/mozilla/vk.pl b/bin/mozilla/vk.pl
index 73a7a69..e54a5fc 100644 (file)
--- a/bin/mozilla/vk.pl
+++ b/bin/mozilla/vk.pl
@@ -252,9 +252,9 @@ sub invoice_transactions {
       my $name;
       my $headerrow;
       if ( $form->{mainsort} eq 'parts_id' ) {
-       $headerrow->{description}->{data} = "$ar->{description}";
+        $headerrow->{description}->{data} = "$ar->{description}";
       } else {
-       $headerrow->{description}->{data} = "$ar->{name}";
+        $headerrow->{description}->{data} = "$ar->{name}";
       };
       $headerrow->{description}->{class} = "listmainsortheader";
       my $headerrow_set = [ $headerrow ];

diff --git a/t/004template.t b/t/004template.t
index 403e185..128d4af 100644 (file)
--- a/t/004template.t
+++ b/t/004template.t
@@ -56,7 +56,7 @@ my $fh;
 
 # test master files for <translate> tag
 foreach my $ref (@Support::Templates::referenced_files) {
-    my $file = "${template_path}${ref}_master.html";
+    my $file = "${template_path}${ref}.html";
     my $data = read_file($file) || die "??? couldn't open $file";
     if ($data =~ /<translate>/) {
         ok(0, "$file uses deprecated <translate> tags.");