Die Variablen aus %myconfig beim Drucken nicht einfach so nach $form kopieren --...

diff --git a/SL/IS.pm b/SL/IS.pm
index aa2b087bfa876134a264240184f271bd992737d7..0e652874a270b77f98bd7cb936563ea382540e24 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -445,7 +445,7 @@ sub customer_details {
   }
 
   # get rest for the customer
   }
 
   # 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|;
                  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 6226a571e0248aa41ef6fa22e31840e5ec35c683..8873198c07ba4cfa459ab7b2cfdfee1f1dbd8c36 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -1198,9 +1198,6 @@ sub order_details {
     $form->set_payment_options($myconfig, $form->{orddate});
   }
 
     $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;
   $form->{username} = $myconfig->{name};
 
   $dbh->disconnect;

diff --git a/doc/dokumentenvorlagen-und-variablen.html b/doc/dokumentenvorlagen-und-variablen.html
index 18f987e7a557de017d16755eea50119a8b86fc6c..3e68a63eb580e25b39d4a40ef3493d33d2945625 100644 (file)
--- a/doc/dokumentenvorlagen-und-variablen.html
+++ b/doc/dokumentenvorlagen-und-variablen.html
@@ -241,13 +241,25 @@ td {
     <td>Kreditlimit</td>
    </tr>
    <tr>
     <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>
    <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>
    <tr>
     <td><code>discount</code></td>
     <td>Rabatt</td>