Vorlagen: Einige Variablen zum Angestellten aus myconfig sollten nur mit dem Praefix...

diff --git a/SL/Form.pm b/SL/Form.pm
index 725eace5a71cbebdf64bb6cd5d866b624a317eca..cddb62140f2453bef8850a2fac95e17791083364 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -758,7 +758,7 @@ sub parse_template {
   $self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
 
   map({ $self->{"employee_${_}"} = $myconfig->{$_}; }
   $self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
 
   map({ $self->{"employee_${_}"} = $myconfig->{$_}; }

-      qw(email tel fax name signature));
+      qw(email tel fax name signature company address businessnumber));

 
   open(IN, "$self->{templates}/$self->{IN}")
     or $self->error("$self->{IN} : $!");
 
   open(IN, "$self->{templates}/$self->{IN}")
     or $self->error("$self->{IN} : $!");

diff --git a/SL/IS.pm b/SL/IS.pm
index 31ded06f0edcd10dd6c72150622a3ef9c2da07b6..e29f67fe2717941cb5c49e906c1f49ea95dbe0c6 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -304,9 +304,6 @@ sub invoice_details {
 
   $form->{paid} = $form->format_amount($myconfig, $form->{paid}, 2);
 
 
   $form->{paid} = $form->format_amount($myconfig, $form->{paid}, 2);
 

-  # myconfig variables
-  map { $form->{$_} = $myconfig->{$_} }
-    (qw(company address tel fax signature businessnumber));

   $form->{username} = $myconfig->{name};
 
   $dbh->disconnect;
   $form->{username} = $myconfig->{name};
 
   $dbh->disconnect;