X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=4c8001ac85b0ab7665b32d2f1d4185368dc9d4ff;hb=fd7e51e949f6525e98d4df24f7fee5f1a1167891;hp=51ab07b3c4be8a3b1d59db407a4c8a2214f4f730;hpb=97422880ec1448b61c609c3d2a6257c1f5d582bf;p=kivitendo-erp.git diff --git a/SL/DN.pm b/SL/DN.pm index 51ab07b3c..4c8001ac8 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -37,7 +37,9 @@ package DN; use SL::Common; use SL::DBUtils; +use SL::DB::AuthUser; use SL::DB::Default; +use SL::DB::Employee; use SL::GenericTranslations; use SL::IS; use SL::Mailer; @@ -71,9 +73,10 @@ sub get_config { } $query = - qq|SELECT dunning_ar_amount_fee, dunning_ar_amount_interest, dunning_ar + qq|SELECT dunning_ar_amount_fee, dunning_ar_amount_interest, dunning_ar, dunning_creator FROM defaults|; - ($form->{AR_amount_fee}, $form->{AR_amount_interest}, $form->{AR}) = selectrow_query($form, $dbh, $query); + ($form->{AR_amount_fee}, $form->{AR_amount_interest}, $form->{AR}, $form->{dunning_creator}) + = selectrow_query($form, $dbh, $query); $main::lxdebug->leave_sub(); } @@ -135,8 +138,10 @@ sub _save_config { } } - $query = qq|UPDATE defaults SET dunning_ar_amount_fee = ?, dunning_ar_amount_interest = ?, dunning_ar = ?|; - @values = (conv_i($form->{AR_amount_fee}), conv_i($form->{AR_amount_interest}), conv_i($form->{AR})); + $query = qq|UPDATE defaults SET dunning_ar_amount_fee = ?, dunning_ar_amount_interest = ?, dunning_ar = ?, + dunning_creator = ?|; + @values = (conv_i($form->{AR_amount_fee}), conv_i($form->{AR_amount_interest}), conv_i($form->{AR}), + $form->{dunning_creator}); do_query($form, $dbh, $query, @values); return 1; @@ -382,8 +387,8 @@ sub send_email { my $query = qq|SELECT dcfg.email_body, dcfg.email_subject, dcfg.email_attachment, - c.email AS recipient - + COALESCE (NULLIF(c.invoice_mail, ''), c.email) AS recipient, c.name, + (SELECT login from employee where id = ar.employee_id) as invoice_employee_login FROM dunning d LEFT JOIN dunning_config dcfg ON (d.dunning_config_id = dcfg.id) LEFT JOIN ar ON (d.trans_id = ar.id) @@ -392,20 +397,38 @@ sub send_email { LIMIT 1|; my $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id); - if (!$ref || !$ref->{recipient} || !$myconfig->{email}) { + # without a recipient, we cannot send a mail + if (!$ref || !$ref->{recipient}) { $main::lxdebug->leave_sub(); - return; + die $main::locale->text("No email recipient for customer #1 defined.", $ref->{name}); + } + + # without a sender we cannot send a mail + # two cases: check mail from 1. current user OR 2. employee who created the invoice + my ($from, $sign); + if ($::instance_conf->get_dunning_creator eq 'current_employee') { + $from = $myconfig->{email}; + die $main::locale->text('No email for current user #1 defined.', $myconfig->{name}) unless $from; + } else { + eval { + $from = SL::DB::Manager::AuthUser->find_by(login => $ref->{invoice_employee_login})->get_config_value("email"); + $sign = SL::DB::Manager::AuthUser->find_by(login => $ref->{invoice_employee_login})->get_config_value("signature"); + die unless ($from); + 1; + } or die $main::locale->text('No email for user with login #1 defined.', $ref->{invoice_employee_login}); } my $template = SL::Template::create(type => 'PlainText', form => $form, myconfig => $myconfig); my $mail = Mailer->new(); $mail->{bcc} = $form->get_bcc_defaults($myconfig, $form->{bcc}); - $mail->{from} = $myconfig->{email}; + $mail->{from} = $from; $mail->{to} = $ref->{recipient}; $mail->{subject} = $template->parse_block($ref->{email_subject}); $mail->{message} = $template->parse_block($ref->{email_body}); - + my $sign_backup = $::myconfig{signature}; + $::myconfig{signature} = $sign if $sign; $mail->{message} .= $form->create_email_signature(); + $::myconfig{signature} = $sign_backup if $sign; $mail->{message} =~ s/\r\n/\n/g; @@ -511,6 +534,11 @@ sub get_invoices { push(@values, like($form->{customer})); } + if ($form->{department_id}) { + $where .= qq| AND (a.department_id = ?)|; + push(@values, $form->{department_id}); + } + my %columns = ( "ordnumber" => "a.ordnumber", "invnumber" => "a.invnumber", @@ -550,6 +578,7 @@ sub get_invoices { ct.name AS customername, a.customer_id, a.duedate, a.amount - a.paid AS open_amount, a.direct_debit, + dep.description as departmentname, cfg.dunning_description, cfg.dunning_level, @@ -567,6 +596,7 @@ sub get_invoices { FROM ar a LEFT JOIN customer ct ON (a.customer_id = ct.id) + LEFT JOIN department dep ON (a.department_id = dep.id) LEFT JOIN dunning_config cfg ON (a.dunning_config_id = cfg.id) LEFT JOIN dunning_config nextcfg ON (nextcfg.id = @@ -904,10 +934,14 @@ sub print_dunning { delete $form->{tmpfile}; push @{ $form->{DUNNING_PDFS} }, $filename; - push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${spool}/$filename", + push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'path' => "${spool}/$filename", 'name' => $form->get_formname_translation('dunning') . "_${dunning_id}.pdf" }; - $form->get_employee_data('prefix' => 'employee', 'id' => $form->{employee_id}); + my $employee_id = ($::instance_conf->get_dunning_creator eq 'invoice_employee') ? + $form->{employee_id} : + SL::DB::Manager::Employee->current->id; + + $form->get_employee_data('prefix' => 'employee', 'id' => $employee_id); $form->get_employee_data('prefix' => 'salesman', 'id' => $form->{salesman_id}); $form->{attachment_type} = "dunning"; @@ -1033,6 +1067,13 @@ sub set_customer_cvars { translation_type => 'greetings::' . ($form->{cp_gender} eq 'f' ? 'female' : 'male'), language_id => $form->{language_id}, allow_fallback => 1); + if ($form->{cp_id}) { + $custom_variables = CVar->get_custom_variables(dbh => $form->get_standard_dbh, + module => 'Contacts', + trans_id => $form->{cp_id}); + $form->{"cp_cvar_$_->{name}"} = $_->{value} for @{ $custom_variables }; + } + } 1;