X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/f1b9dfcd86ce757a4fdb1f9d924dc62deb7998e8..29254bae64b881dba588f7a02027dac0d1c7b022:/bin/mozilla/io.pl

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 96141c0ec..ece721f33 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -910,7 +910,7 @@ sub order {
 
   _order();
 
-  if ($::instance_conf->get_feature_experimental) {
+  if ($::instance_conf->get_feature_experimental_order) {
     my $order = _make_record();
     $order->globalproject_id(undef) if !$order->globalproject_id;
     $order->payment_id(undef)       if !$order->payment_id;
@@ -1040,7 +1040,7 @@ sub quotation {
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;
   }
- delete $form->{$_} foreach (qw(id printed emailed queued quonumber));
+  delete $form->{$_} foreach (qw(id printed emailed queued quonumber transaction_description));
 
   my $buysell;
   if ($form->{script} eq 'ir.pl' || $form->{type} eq 'purchase_order') {
@@ -2023,7 +2023,12 @@ sub show_sales_purchase_email_dialog {
   if ($::form->{cp_id}) {
     $email = SL::DB::Contact->load_cached($::form->{cp_id})->cp_email;
   }
-
+  my $invoice_mail;
+  if ($::form->{type} eq 'invoice' && !$email) {
+    # check for invoice_mail
+    $email = SL::DB::Customer->load_cached($::form->{vc_id})->invoice_mail;
+    $invoice_mail = 1 if $email;
+  }
   if (!$email && $::form->{vc} && $::form->{vc_id}) {
     $email = SL::DB::Customer->load_cached($::form->{vc_id})->email if 'customer' eq $::form->{vc};
     $email = SL::DB::Vendor  ->load_cached($::form->{vc_id})->email if 'vendor'   eq $::form->{vc};
@@ -2045,6 +2050,7 @@ sub show_sales_purchase_email_dialog {
     show_bcc    => $::auth->assert('email_bcc', 'may fail'),
     FILES       => \%files,
     is_customer => $::form->{vc} eq 'customer',
+    is_invoice_mail => $invoice_mail,
   });
 
   print $::form->ajax_response_header, $html;