Rechnungsversand E-Mail-Body

Falls die generische E-Mail-Adresse verwendet wird, sollte auch
die generische Anrede hinterlegt sein, selbst wenn ein Ansprechpartner
noch in CC gesetzt wird.

diff --git a/SL/Form.pm b/SL/Form.pm
index da4684358df7ff2ce230743e7ee99cb0bfa1c9ca..d4b39f6c10543aacf2b058eb9de8ac1f642a2582 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1344,7 +1344,7 @@ sub generate_email_subject {
 
 sub generate_email_body {
   $main::lxdebug->enter_sub();
 
 sub generate_email_body {
   $main::lxdebug->enter_sub();

-  my ($self) = @_;
+  my ($self, %params) = @_;

   # simple german and english will work grammatically (most european languages as well)
   # Dear Mr Alan Greenspan:
   # Sehr geehrte Frau Meyer,
   # simple german and english will work grammatically (most european languages as well)
   # Dear Mr Alan Greenspan:
   # Sehr geehrte Frau Meyer,


@@ -1352,7 +1352,7 @@ sub generate_email_body {
   # Gentile Signora Ferrari,
   my $body = '';
 
   # Gentile Signora Ferrari,
   my $body = '';
 

-  if ($self->{cp_id}) {
+  if ($self->{cp_id} && !$params{inv_email}) {

     my $givenname = SL::DB::Contact->load_cached($self->{cp_id})->cp_givenname; # for qw(gender givename name);
     my $name      = SL::DB::Contact->load_cached($self->{cp_id})->cp_name; # for qw(gender givename name);
     my $gender    = SL::DB::Contact->load_cached($self->{cp_id})->cp_gender; # for qw(gender givename name);
     my $givenname = SL::DB::Contact->load_cached($self->{cp_id})->cp_givenname; # for qw(gender givename name);
     my $name      = SL::DB::Contact->load_cached($self->{cp_id})->cp_name; # for qw(gender givename name);
     my $gender    = SL::DB::Contact->load_cached($self->{cp_id})->cp_gender; # for qw(gender givename name);

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 8f2a3156ecd79a7d0c89e5d2a478e69e7f0d6d03..a4a416b95c1909bfdc9e72710674dd10deb3204d 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -2046,7 +2046,7 @@ sub show_sales_purchase_email_dialog {
     to                  => $email,
     cc                  => $email_cc,
     subject             => $::form->generate_email_subject,
     to                  => $email,
     cc                  => $email_cc,
     subject             => $::form->generate_email_subject,

-    message             => $::form->generate_email_body,
+    message             => $::form->generate_email_body('inv_email' => $inv_email),

     attachment_filename => $::form->generate_attachment_filename,
     js_send_function    => 'kivi.SalesPurchase.send_email()',
   };
     attachment_filename => $::form->generate_attachment_filename,
     js_send_function    => 'kivi.SalesPurchase.send_email()',
   };