SL::DBUpgrade2: Dateien direkt als UTF-8 öffnen und SL::IConv nicht nutzen

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index a61a6c8bb9518244e01c0cf6e1374ebdcf9e19f7..acc5cff995d0b69a009f07f535691b3ddf02501b 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -467,7 +467,7 @@ sub header {
   # standard css for all
   # this should gradually move to the layouts that need it
   $layout->use_stylesheet("$_.css") for qw(
   # standard css for all
   # this should gradually move to the layouts that need it
   $layout->use_stylesheet("$_.css") for qw(

-    main menu list_accounts jquery.autocomplete
+    main menu common list_accounts jquery.autocomplete

     jquery.multiselect2side
     ui-lightness/jquery-ui
     jquery-ui.custom
     jquery.multiselect2side
     ui-lightness/jquery-ui
     jquery-ui.custom


@@ -476,7 +476,7 @@ sub header {
   $layout->use_javascript("$_.js") for (qw(
     jquery jquery-ui jquery.cookie jquery.checkall jquery.download
     jquery/jquery.form jquery/fixes client_js
   $layout->use_javascript("$_.js") for (qw(
     jquery jquery-ui jquery.cookie jquery.checkall jquery.download
     jquery/jquery.form jquery/fixes client_js

-    common part_selection switchmenuframe autocomplete_part
+    common part_selection switchmenuframe

   ), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}");
 
   $self->{favicon} ||= "favicon.ico";
   ), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}");
 
   $self->{favicon} ||= "favicon.ico";


@@ -1137,7 +1137,7 @@ sub parse_template {
       $full_signature         =~ s/\n/<br>\n/g;
       $mail->{message}       .=  $full_signature;
 
       $full_signature         =~ s/\n/<br>\n/g;
       $mail->{message}       .=  $full_signature;
 

-      open(IN, "<", $self->{tmpfile})
+      open(IN, "<:encoding(UTF-8)", $self->{tmpfile})

         or $self->error($self->cleanup . "$self->{tmpfile} : $!");
       $mail->{message} .= $_ while <IN>;
       close(IN);
         or $self->error($self->cleanup . "$self->{tmpfile} : $!");
       $mail->{message} .= $_ while <IN>;
       close(IN);


@@ -1326,7 +1326,7 @@ sub cleanup {
     push @err, $::locale->text('The application "#1" was not found on the system.', $application || 'pdflatex') . ' ' . $::locale->text('Please contact your administrator.');
 
   } elsif (-f "$self->{tmpfile}.err") {
     push @err, $::locale->text('The application "#1" was not found on the system.', $application || 'pdflatex') . ' ' . $::locale->text('Please contact your administrator.');
 
   } elsif (-f "$self->{tmpfile}.err") {

-    open(FH, "$self->{tmpfile}.err");
+    open(FH, "<:encoding(UTF-8)", "$self->{tmpfile}.err");

     @err = <FH>;
     close(FH);
   }
     @err = <FH>;
     close(FH);
   }


@@ -2430,7 +2430,7 @@ sub get_lists {
   }
 
   if ($params{"salesmen"}) {
   }
 
   if ($params{"salesmen"}) {

-    $self->_get_employees($dbh, "all_salesmen", $params{"salesmen"});
+    $self->_get_employees($dbh, $params{"salesmen"});

   }
 
   if ($params{"business_types"}) {
   }
 
   if ($params{"business_types"}) {