X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FBackgroundJob%2FCreatePeriodicInvoices.pm;h=45a41d012c7216742b7cb05db39861cdebf34f44;hb=808bfd679e48691da8f0b9bbb8c778ab7805cbda;hp=c8b16ab4bdb25111a1f493a447997b3709315532;hpb=54ce51443886623bb785e7c54492ecbc8dc9b3aa;p=kivitendo-erp.git diff --git a/SL/BackgroundJob/CreatePeriodicInvoices.pm b/SL/BackgroundJob/CreatePeriodicInvoices.pm index c8b16ab4b..45a41d012 100644 --- a/SL/BackgroundJob/CreatePeriodicInvoices.pm +++ b/SL/BackgroundJob/CreatePeriodicInvoices.pm @@ -61,11 +61,14 @@ sub run { push @invoices_to_print, $data if $config->print; push @invoices_to_email, $data if $config->send_email; - # last; + my $inactive_ordnumber = $config->disable_one_time_config; + if ($inactive_ordnumber) { + # disable one time configs and skip eventual invoices + _log_msg("Order " . $inactive_ordnumber . " deavtivated \n"); + push @disabled_orders, $inactive_ordnumber; + last; + } } - # disable one time configs (periodicity is only one time). - my $inactive_ordnumber = $config->disable_one_time_config; - push @disabled_orders, $inactive_ordnumber if $inactive_ordnumber; } foreach my $inv ( @invoices_to_print ) { $self->_print_invoice($inv); } @@ -397,14 +400,17 @@ sub _email_invoice { ); } + my $global_bcc = SL::DB::Default->get->global_bcc; + for my $recipient (@recipients) { my $mail = Mailer->new; $mail->{from} = $data->{config}->email_sender || $::lx_office_conf{periodic_invoices}->{email_from}; $mail->{to} = $recipient; + $mail->{bcc} = $global_bcc; $mail->{subject} = $data->{config}->email_subject; $mail->{message} = $data->{config}->email_body; $mail->{attachments} = [{ - filename => $pdf_file_name, + path => $pdf_file_name, name => sprintf('%s %s.pdf', $::locale->text('Invoice'), $data->{invoice}->invnumber), }];