'templates' nicht aus %::myconfig, sondern aus Defaults-Tabelle holen

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index d6cba73213c01f82b89bf00120f7ba4869abf7ef..0246f232eb0896d94953352eb58d79b63f0a5bf1 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -53,6 +53,7 @@ use SL::CVar;
 use SL::DB;
 use SL::DBConnect;
 use SL::DBUtils;
 use SL::DB;
 use SL::DBConnect;
 use SL::DBUtils;

+use SL::DB::Default;

 use SL::DO;
 use SL::IC;
 use SL::IS;
 use SL::DO;
 use SL::IC;
 use SL::IS;


@@ -3368,7 +3369,9 @@ sub restore_vars {
 sub prepare_for_printing {
   my ($self) = @_;
 
 sub prepare_for_printing {
   my ($self) = @_;
 

-  $self->{templates} ||= $::myconfig{templates};
+  my $defaults         = SL::DB::Default->get;
+
+  $self->{templates} ||= $defaults->templates;

   $self->{formname}  ||= $self->{type};
   $self->{media}     ||= 'email';
 
   $self->{formname}  ||= $self->{type};
   $self->{media}     ||= 'email';
 


@@ -3420,7 +3423,7 @@ sub prepare_for_printing {
   }
 
   my $printer_code    = $self->{printer_code} ? '_' . $self->{printer_code} : '';
   }
 
   my $printer_code    = $self->{printer_code} ? '_' . $self->{printer_code} : '';

-  my $email_extension = -f "$::myconfig{templates}/$self->{formname}_email${language}.${extension}" ? '_email' : '';
+  my $email_extension = -f ($defaults->templates . "/$self->{formname}_email${language}.${extension}") ? '_email' : '';

   $self->{IN}         = "$self->{formname}${email_extension}${language}${printer_code}.${extension}";
 
   # Format dates.
   $self->{IN}         = "$self->{formname}${email_extension}${language}${printer_code}.${extension}";
 
   # Format dates.