From 7748fe8e500152ddf3b2ab12b64bd606fc2a6259 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 21 Feb 2007 08:46:22 +0000
Subject: [PATCH] =?utf8?q?Die=20Variablen=20aus=20%myconfig=20beim=20Druck?=
 =?utf8?q?en=20nicht=20einfach=20so=20nach=20$form=20kopieren=20--=20daf?=
 =?utf8?q?=C3=BCr=20gibt=20es=20sp=C3=A4ter=20ja=20employee=5F*=20in=20For?=
 =?utf8?q?m::parse=5Ftemplate().=20Zus=C3=A4tzlich=20einige=20weitere=20Ku?=
 =?utf8?q?ndenvariablen=20als=20customer*=20zur=20Verf=C3=BCgung=20stellen?=
 =?utf8?q?=20(analog=20zu=20den=20Lieferantenvariablen).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/IS.pm                                  |  2 +-
 SL/OE.pm                                  |  3 ---
 doc/dokumentenvorlagen-und-variablen.html | 16 ++++++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/SL/IS.pm b/SL/IS.pm
index aa2b087bf..0e652874a 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -445,7 +445,7 @@ sub customer_details {
   }
 
   # get rest for the customer
-  my $query = qq|SELECT ct.*, cp.*, ct.notes as customernotes
+  my $query = qq|SELECT ct.*, cp.*, ct.notes as customernotes, ct.phone AS customerphone, ct.fax AS customerfax, ct.email AS customeremail
                  FROM customer ct
                  LEFT JOIN contacts cp on ct.id = cp.cp_cv_id
 		 WHERE ct.id = $form->{customer_id} $contact order by cp.cp_id limit 1|;
diff --git a/SL/OE.pm b/SL/OE.pm
index 6226a571e..8873198c0 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -1198,9 +1198,6 @@ sub order_details {
     $form->set_payment_options($myconfig, $form->{orddate});
   }
 
-  # myconfig variables
-  map { $form->{$_} = $myconfig->{$_} }
-    (qw(company address tel fax signature businessnumber));
   $form->{username} = $myconfig->{name};
 
   $dbh->disconnect;
diff --git a/doc/dokumentenvorlagen-und-variablen.html b/doc/dokumentenvorlagen-und-variablen.html
index 18f987e7a..3e68a63eb 100644
--- a/doc/dokumentenvorlagen-und-variablen.html
+++ b/doc/dokumentenvorlagen-und-variablen.html
@@ -241,13 +241,25 @@ td {
     <td>Kreditlimit</td>
    </tr>
    <tr>
-    <td><code>customernumber</code></td>
-    <td>Kundennummer; nur f&uuml;r Kunden</td>
+    <td><code>customeremail</code></td>
+    <td>Email des Kunden; nur f&uuml;r Kunden</td>
+   </tr>
+   <tr>
+    <td><code>customerfax</code></td>
+    <td>Faxnummer des Kunden; nur f&uuml;r Kunden</td>
    </tr>
    <tr>
     <td><code>customernotes</code></td>
     <td>Bemerkungen beim Kunden; nur f&uuml;r Kunden</td>
    </tr>
+   <tr>
+    <td><code>customernumber</code></td>
+    <td>Kundennummer; nur f&uuml;r Kunden</td>
+   </tr>
+   <tr>
+    <td><code>customerphone</code></td>
+    <td>Telefonnummer des Kunden; nur f&uuml;r Kunden</td>
+   </tr>
    <tr>
     <td><code>discount</code></td>
     <td>Rabatt</td>
-- 
2.20.1