From 8efe3525b0835a3759aebacd9fbcf204db9f84da Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 11 Apr 2006 14:01:43 +0000
Subject: [PATCH] Vorlagen: Einige Variablen zum Angestellten aus myconfig
 sollten nur mit dem Praefix "employee_" zur Verfuegung stehen, weil sie
 ansonsten andere Variablen (z.B. Faxnummer eines Lieferanten) ueberschreiben.

---
 SL/Form.pm | 2 +-
 SL/IS.pm   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/SL/Form.pm b/SL/Form.pm
index 725eace5a..cddb62140 100644
--- 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->{$_}; }
-      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} : $!");
diff --git a/SL/IS.pm b/SL/IS.pm
index 31ded06f0..e29f67fe2 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -304,9 +304,6 @@ sub invoice_details {
 
   $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;
-- 
2.20.1