Beim Ausdruck die Variablen für den Verkäufer (salesman_*) füllen.

diff --git a/SL/Form.pm b/SL/Form.pm
index 3f1e877d22a3c43e81fcbff125e35ddfab0f1e6e..d690be1c151e6c21eb1dc40f1c77bc41dfbf05b3 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -44,6 +44,7 @@ use SL::Template;
 use CGI::Ajax;
 use SL::DBUtils;
 use SL::Menu;
 use CGI::Ajax;
 use SL::DBUtils;
 use SL::Menu;

+use SL::User;

 use CGI;
 
 sub _input_to_hash {
 use CGI;
 
 sub _input_to_hash {


@@ -1377,6 +1378,35 @@ sub get_employee {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

+sub get_salesman {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $salesman_id) = @_;
+
+  my $dbh = $self->dbconnect($myconfig);
+
+  my ($login) =
+    selectrow_query($self, $dbh, qq|SELECT login FROM employee WHERE id = ?|,
+                    $salesman_id);
+
+  if ($login) {
+    my $user = new User($main::memberfile, $login);
+    map({ $self->{"salesman_$_"} = $user->{$_}; }
+        qw(address businessnumber co_ustid company duns email fax name
+           taxnumber tel));
+    $self->{salesman_login} = $login;
+
+    $self->{salesman_name} = $login
+      if ($self->{salesman_name} eq "");
+
+    map({ $self->{"salesman_$_"} =~ s/\\n/\n/g; } qw(address company));
+  }
+
+  $dbh->disconnect();
+
+  $main::lxdebug->leave_sub();
+}
+

 sub get_duedate {
   $main::lxdebug->enter_sub();
 
 sub get_duedate {
   $main::lxdebug->enter_sub();
 


@@ -2498,28 +2528,6 @@ sub update_business {
   return $var;
 }
 
   return $var;
 }
 

-sub get_salesman {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $salesman) = @_;
-
-  my $dbh   = $self->dbconnect($myconfig);
-  my $query =
-    qq|SELECT id, name FROM customer  WHERE (customernumber ilike '%$salesman%' OR name ilike '%$salesman%') AND business_id in (SELECT id from business WHERE salesman)|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $self->dberror($query);
-
-  my $i = 0;
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push(@{ $self->{salesman_list} }, $ref);
-    $i++;
-  }
-  $dbh->commit;
-  $main::lxdebug->leave_sub();
-
-  return $i;
-}
-

 sub get_partsgroup {
   $main::lxdebug->enter_sub();
 
 sub get_partsgroup {
   $main::lxdebug->enter_sub();
 

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 56cdd2f848bae9c503e01070de46f2de789008e1..f20d4e5d21d6498e9ce1b3cbb90f16b3e7c218dc 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1894,6 +1894,7 @@ sub print_form {
 
   $language_saved = $form->{language_id};
   $payment_id_saved = $form->{payment_id};
 
   $language_saved = $form->{language_id};
   $payment_id_saved = $form->{payment_id};

+  $salesman_id_saved = $form->{salesman_id};

 
   &{"$form->{vc}_details"}();
 
 
   &{"$form->{vc}_details"}();
 


@@ -1923,6 +1924,8 @@ sub print_form {
     IS->invoice_details(\%myconfig, \%$form, $locale);
   }
 
     IS->invoice_details(\%myconfig, \%$form, $locale);
   }
 

+  $form->get_salesman(\%myconfig, $salesman_id_saved);
+

   if ($form->{shipto_id}) {
     $form->get_shipto(\%myconfig);
   }
   if ($form->{shipto_id}) {
     $form->get_shipto(\%myconfig);
   }

diff --git a/doc/dokumentenvorlagen-und-variablen.html b/doc/dokumentenvorlagen-und-variablen.html
index 3e68a63eb580e25b39d4a40ef3493d33d2945625..fe7d321cb3a5901bf2f03631474133af83674ffd 100644 (file)
--- a/doc/dokumentenvorlagen-und-variablen.html
+++ b/doc/dokumentenvorlagen-und-variablen.html
@@ -55,6 +55,9 @@ td {
     <li><a href="dokumentenvorlagen-und-variablen.html#allgemein_stammdaten">
       Stammdaten von Kunden und Lieferanten</a></li>
 
     <li><a href="dokumentenvorlagen-und-variablen.html#allgemein_stammdaten">
       Stammdaten von Kunden und Lieferanten</a></li>
 

+    <li><a href="dokumentenvorlagen-und-variablen.html#allgemein_bearbeiter">
+      Informationen &uuml;ber den Bearbeiter</a></li>
+

     <li><a href="dokumentenvorlagen-und-variablen.html#allgemein_verkaeufer">
       Informationen &uuml;ber den Verk&auml;ufer</a></li>
 
     <li><a href="dokumentenvorlagen-und-variablen.html#allgemein_verkaeufer">
       Informationen &uuml;ber den Verk&auml;ufer</a></li>
 


@@ -390,8 +393,8 @@ td {
   sondern schlicht Kopien der Lieferdatenvariablen sind
   (z.B. <code>shiptocontact</code>).</p>
 
   sondern schlicht Kopien der Lieferdatenvariablen sind
   (z.B. <code>shiptocontact</code>).</p>
 

- <h3><a name="allgemein_verkaeufer">
-   Informationen &uuml;ber den Verkäufer:</a></h3>
+ <h3><a name="allgemein_bearbeiter">
+   Informationen &uuml;ber den Bearbeiter:</a></h3>

 
  <p>
   <table border="1">
 
  <p>
   <table border="1">


@@ -443,6 +446,59 @@ td {
   </table>
  </p>
 
   </table>
  </p>
 

+ <h3><a name="allgemein_verkaeufer">
+   Informationen &uuml;ber den Verk&auml;fer (nur bei Verkaufsmasken):</a></h3>
+
+ <p>
+  <table border="1">
+   <tr><th>Variablenname</th><th>Bedeutung</th></tr>
+   <tr>
+    <td><code>salesman_address</code></td>
+    <td>Adressfeld</td>
+   </tr>
+   <tr>
+    <td><code>salesman_businessnumber</code></td>
+    <td>Firmennummer</td>
+   </tr>
+   <tr>
+    <td><code>salesman_company</code></td>
+    <td>Firmenname</td>
+   </tr>
+   <tr>
+    <td><code>salesman_co_ustid</code></td>
+    <td>Usatzsteuer-Identifikationsnummer</td>
+   </tr>
+   <tr>
+    <td><code>salesman_duns</code></td>
+    <td>DUNS-Nummer</td>
+   </tr>
+   <tr>
+    <td><code>salesman_email</code></td>
+    <td>Email</td>
+   </tr>
+   <tr>
+    <td><code>salesman_fax</code></td>
+    <td>Fax</td>
+   </tr>
+   <tr>
+    <td><code>salesman_name</code></td>
+    <td>voller Name</td>
+   </tr>
+   <tr>
+    <td><code>salesman_signature</code></td>
+    <td>Signatur</td>
+   </tr>
+   <tr>
+    <td><code>salesman_taxnumber</code></td>
+    <td>Steuernummer</td>
+   </tr>
+   <tr>
+    <td><code>salesman_tel</code></td>
+    <td>Telefonnummer</td>
+   </tr>
+  </table>
+ </p>
+

  <h3><a name="allgemein_steuern">
    Variablen f&uuml;r die einzelnen Steuern:</a></h3>
 
  <h3><a name="allgemein_steuern">
    Variablen f&uuml;r die einzelnen Steuern:</a></h3>