Variablen in Druckvorlagen optional unformatiert ausgeben lassen

diff --git a/SL/Template/Simple.pm b/SL/Template/Simple.pm
index 9960908da51e2eb0f413eec75b44f515e85d3676..d29ec8f5ca8d2432b2ec13ffee6bab6e8a1d6c27 100644 (file)
--- a/SL/Template/Simple.pm
+++ b/SL/Template/Simple.pm
@@ -125,10 +125,12 @@ sub substitute_vars {
 
   while ($text =~ /$self->{substitute_vars_re}/) {
     my ($tag_pos, $tag_len) = ($-[0], $+[0] - $-[0]);
 
   while ($text =~ /$self->{substitute_vars_re}/) {
     my ($tag_pos, $tag_len) = ($-[0], $+[0] - $-[0]);

-    my ($var, @options)     = split(/\s+/, $1);
+    my ($var, @option_list) = split(/\s+/, $1);
+    my %options             = map { ($_ => 1) } @option_list;

 
     my $value               = $self->_get_loop_variable($var, 0, @indices);
 
     my $value               = $self->_get_loop_variable($var, 0, @indices);

-    $value                  = $self->format_string($value) unless (grep(/^NOESCAPE$/, @options));
+    $value                  = $form->parse_amount({ numberformat => $::myconfig{output_numberformat} || $::myconfig{numberformat} }, $value) if     $options{NOFORMAT};
+    $value                  = $self->format_string($value)                                                                                   unless $options{NOESCAPE};

 
     substr($text, $tag_pos, $tag_len, $value);
   }
 
     substr($text, $tag_pos, $tag_len, $value);
   }

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 2d23c76ae81ac00d2bea184b8746bcb276284777..62cdfdd7ea7eb802b419b767d2d5aaa907b7186f 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1341,6 +1341,10 @@ sub print_form {
     $output_longdates = 1;
   }
 
     $output_longdates = 1;
   }
 

+  # Store the output number format so that the template modules know
+  # how to parse the amounts back if requested.
+  $myconfig{output_numberformat} = $output_numberformat;
+

   ($form->{employee}) = split /--/, $form->{employee};
 
   # create the form variables
   ($form->{employee}) = split /--/, $form->{employee};
 
   # create the form variables