Fehlende Localesläufe aus 4091 und 4093.

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 370bbe61c8f0a2f131685714e48151be058737d3..c13422264806f5daed40aa5689cc7d28cb10cf97 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -195,6 +195,7 @@ sub _request_to_hash {
 }
 
 sub _recode_recursively {
 }
 
 sub _recode_recursively {

+  $main::lxdebug->enter_sub();

   my ($iconv, $param) = @_;
 
   if (ref $param eq 'HASH') {
   my ($iconv, $param) = @_;
 
   if (ref $param eq 'HASH') {


@@ -215,6 +216,7 @@ sub _recode_recursively {
       }
     }
   }
       }
     }
   }

+  $main::lxdebug->leave_sub();

 }
 
 sub new {
 }
 
 sub new {


@@ -261,7 +263,7 @@ sub new {
   $self->{action}  =  lc $self->{action};
   $self->{action}  =~ s/( |-|,|\#)/_/g;
 
   $self->{action}  =  lc $self->{action};
   $self->{action}  =~ s/( |-|,|\#)/_/g;
 

-  $self->{version} =  "2.6.0 beta 1";
+  $self->{version} =  "2.6.0 beta 2";

 
   $main::lxdebug->leave_sub();
 
 
   $main::lxdebug->leave_sub();
 


@@ -394,28 +396,33 @@ sub unescape {
 }
 
 sub quote {
 }
 
 sub quote {

+  $main::lxdebug->enter_sub();

   my ($self, $str) = @_;
 
   if ($str && !ref($str)) {
     $str =~ s/\"/"/g;
   }
 
   my ($self, $str) = @_;
 
   if ($str && !ref($str)) {
     $str =~ s/\"/"/g;
   }
 

-  $str;
+  $main::lxdebug->leave_sub();

 
 

+  return $str;

 }
 
 sub unquote {
 }
 
 sub unquote {

+  $main::lxdebug->enter_sub();

   my ($self, $str) = @_;
 
   if ($str && !ref($str)) {
     $str =~ s/"/\"/g;
   }
 
   my ($self, $str) = @_;
 
   if ($str && !ref($str)) {
     $str =~ s/"/\"/g;
   }
 

-  $str;
+  $main::lxdebug->leave_sub();

 
 

+  return $str;

 }
 
 sub hide_form {
 }
 
 sub hide_form {

+  $main::lxdebug->enter_sub();

   my $self = shift;
 
   if (@_) {
   my $self = shift;
 
   if (@_) {


@@ -426,7 +433,7 @@ sub hide_form {
       print($main::cgi->hidden("-name" => $_, "-default" => $self->{$_}) . "\n");
     }
   }
       print($main::cgi->hidden("-name" => $_, "-default" => $self->{$_}) . "\n");
     }
   }

-
+  $main::lxdebug->leave_sub();

 }
 
 sub error {
 }
 
 sub error {


@@ -1312,6 +1319,7 @@ Content-Length: $numbytes
 }
 
 sub get_formname_translation {
 }
 
 sub get_formname_translation {

+  $main::lxdebug->enter_sub();

   my ($self, $formname) = @_;
 
   $formname ||= $self->{formname};
   my ($self, $formname) = @_;
 
   $formname ||= $self->{formname};


@@ -1333,10 +1341,12 @@ sub get_formname_translation {
     purchase_delivery_order => $main::locale->text('Delivery Order'),
   );
 
     purchase_delivery_order => $main::locale->text('Delivery Order'),
   );
 

+  $main::lxdebug->leave_sub();

   return $formname_translations{$formname}
 }
 
 sub get_number_prefix_for_type {
   return $formname_translations{$formname}
 }
 
 sub get_number_prefix_for_type {

+  $main::lxdebug->enter_sub();

   my ($self) = @_;
 
   my $prefix =
   my ($self) = @_;
 
   my $prefix =


@@ -1345,10 +1355,12 @@ sub get_number_prefix_for_type {
     : ($self->{type} =~ /_delivery_order$/)                   ? 'do'
     :                                                           'ord';
 
     : ($self->{type} =~ /_delivery_order$/)                   ? 'do'
     :                                                           'ord';
 

+  $main::lxdebug->leave_sub();

   return $prefix;
 }
 
 sub get_extension_for_format {
   return $prefix;
 }
 
 sub get_extension_for_format {

+  $main::lxdebug->enter_sub();

   my ($self)    = @_;
 
   my $extension = $self->{format} =~ /pdf/i          ? ".pdf"
   my ($self)    = @_;
 
   my $extension = $self->{format} =~ /pdf/i          ? ".pdf"


@@ -1357,10 +1369,12 @@ sub get_extension_for_format {
                 : $self->{format} =~ /html/i         ? ".html"
                 :                                      "";
 
                 : $self->{format} =~ /html/i         ? ".html"
                 :                                      "";
 

+  $main::lxdebug->leave_sub();

   return $extension;
 }
 
 sub generate_attachment_filename {
   return $extension;
 }
 
 sub generate_attachment_filename {

+  $main::lxdebug->enter_sub();

   my ($self) = @_;
 
   my $attachment_filename = $main::locale->unquote_special_chars('HTML', $self->get_formname_translation());
   my ($self) = @_;
 
   my $attachment_filename = $main::locale->unquote_special_chars('HTML', $self->get_formname_translation());


@@ -1379,10 +1393,12 @@ sub generate_attachment_filename {
   $attachment_filename =  $main::locale->quote_special_chars('filenames', $attachment_filename);
   $attachment_filename =~ s|[\s/\\]+|_|g;
 
   $attachment_filename =  $main::locale->quote_special_chars('filenames', $attachment_filename);
   $attachment_filename =~ s|[\s/\\]+|_|g;
 

+  $main::lxdebug->leave_sub();

   return $attachment_filename;
 }
 
 sub generate_email_subject {
   return $attachment_filename;
 }
 
 sub generate_email_subject {

+  $main::lxdebug->enter_sub();

   my ($self) = @_;
 
   my $subject = $main::locale->unquote_special_chars('HTML', $self->get_formname_translation());
   my ($self) = @_;
 
   my $subject = $main::locale->unquote_special_chars('HTML', $self->get_formname_translation());


@@ -1392,6 +1408,7 @@ sub generate_email_subject {
     $subject .= " " . $self->{"${prefix}number"}
   }
 
     $subject .= " " . $self->{"${prefix}number"}
   }
 

+  $main::lxdebug->leave_sub();

   return $subject;
 }
 
   return $subject;
 }
 


@@ -2812,7 +2829,7 @@ sub create_links {
                                       (startdate <= a.transdate) ORDER BY startdate DESC LIMIT 1))
          WHERE a.trans_id = ?
          AND a.fx_transaction = '0'
                                       (startdate <= a.transdate) ORDER BY startdate DESC LIMIT 1))
          WHERE a.trans_id = ?
          AND a.fx_transaction = '0'

-         ORDER BY a.oid, a.transdate|;
+         ORDER BY a.acc_trans_id, a.transdate|;

     $sth = $dbh->prepare($query);
     do_statement($self, $sth, $query, $self->{id});
 
     $sth = $dbh->prepare($query);
     do_statement($self, $sth, $query, $self->{id});