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;
}
$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();
}
}
}
- $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;
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)
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->{from} = $myconfig->{email};
+ $mail->{bcc} = $form->get_bcc_defaults($myconfig, $form->{bcc});
+ $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;
ar.transdate, ar.duedate, ar.customer_id,
ar.invnumber, ar.ordnumber, ar.cp_id,
ar.amount, ar.netamount, ar.paid,
+ ar.employee_id, ar.salesman_id,
(SELECT cu.name FROM currencies cu WHERE cu.id = ar.currency_id) AS curr,
(SELECT description from department WHERE id = ar.department_id) AS department,
ar.amount - ar.paid AS open_amount,
c.country, c.department_1, c.department_2, c.email, c.customernumber,
c.greeting, c.contact, c.phone, c.fax, c.homepage,
c.email, c.taxincluded, c.business_id, c.taxnumber, c.iban,
- c,ustid, e.name as salesman_name,
+ c.ustid,
+ ar.id AS invoice_id,
co.*
FROM dunning d
LEFT JOIN ar ON (d.trans_id = ar.id)
$query =
qq|SELECT
- cfg.interest_rate, cfg.template AS formname,
+ cfg.interest_rate, cfg.template AS formname, cfg.dunning_level,
cfg.email_subject, cfg.email_body, cfg.email_attachment,
d.transdate AS dunning_date,
(SELECT SUM(fee)
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" };
+ 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";
+ if ( $form->{dunning_level} ) {
+ $form->{attachment_type} .= $form->{dunning_level} if $form->{dunning_level} < 4;
+ }
+ $form->{attachment_filename} = $form->get_formname_translation($form->{attachment_type}) . "_${dunning_id}.pdf";
+ $form->{attachment_id} = $form->{invoice_id};
$form->parse_template($myconfig);
$main::lxdebug->leave_sub();
$query =
qq|SELECT
d.fee_interest_ar_id,
- dcfg.template
+ d.trans_id AS invoice_id,
+ dcfg.template,
+ dcfg.dunning_level
FROM dunning d
LEFT JOIN dunning_config dcfg ON (d.dunning_config_id = dcfg.id)
WHERE d.dunning_id = ?|;
- my ($ar_id, $template) = selectrow_query($form, $dbh, $query, $dunning_id);
+ my ($ar_id, $invoice_id, $template, $dunning_level) = selectrow_query($form, $dbh, $query, $dunning_id);
if (!$ar_id) {
$main::lxdebug->leave_sub();
map { delete $form->{$_} } grep /^[a-z_]+_\d+$/, keys %{ $form };
+ $form->{attachment_filename} = $form->get_formname_translation('dunning_invoice') . "_${dunning_id}.pdf";
+ $form->{attachment_type} = "dunning";
+ $form->{attachment_id} = $form->{invoice_id};
$form->parse_template($myconfig);
restore_form($saved_form);
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;
projects / kivitendo-erp.git / blobdiff