projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo in comments
[kivitendo-erp.git]
/
SL
/
DN.pm
diff --git
a/SL/DN.pm
b/SL/DN.pm
index
20b4184
..
4c8001a
100644
(file)
--- a/
SL/DN.pm
+++ b/
SL/DN.pm
@@
-400,20
+400,22
@@
sub send_email {
# without a recipient, we cannot send a mail
if (!$ref || !$ref->{recipient}) {
$main::lxdebug->leave_sub();
# without a recipient, we cannot send a mail
if (!$ref || !$ref->{recipient}) {
$main::lxdebug->leave_sub();
-
$form->error($main::locale->text("No email recipient for customer #1 defined.", $ref->{name})
);
+
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
}
# 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
;
+ my
($from, $sign)
;
if ($::instance_conf->get_dunning_creator eq 'current_employee') {
$from = $myconfig->{email};
if ($::instance_conf->get_dunning_creator eq 'current_employee') {
$from = $myconfig->{email};
-
$form->error($main::locale->text('No email for current user #1 defined.', $myconfig->{name})
) unless $from;
+
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");
} 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;
1;
- } or d
o { $form->error($main::locale->text('No email for user with login #1 defined.', $ref->{invoice_employee_login})) }
;
+ } or d
ie $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 $template = SL::Template::create(type => 'PlainText', form => $form, myconfig => $myconfig);
@@
-423,8
+425,10
@@
sub send_email {
$mail->{to} = $ref->{recipient};
$mail->{subject} = $template->parse_block($ref->{email_subject});
$mail->{message} = $template->parse_block($ref->{email_body});
$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();
$mail->{message} .= $form->create_email_signature();
+ $::myconfig{signature} = $sign_backup if $sign;
$mail->{message} =~ s/\r\n/\n/g;
$mail->{message} =~ s/\r\n/\n/g;
@@
-530,6
+534,11
@@
sub get_invoices {
push(@values, like($form->{customer}));
}
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",
my %columns = (
"ordnumber" => "a.ordnumber",
"invnumber" => "a.invnumber",
@@
-569,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,
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,
cfg.dunning_description, cfg.dunning_level,
@@
-586,6
+596,7
@@
sub get_invoices {
FROM ar a
LEFT JOIN customer ct ON (a.customer_id = ct.id)
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 =
LEFT JOIN dunning_config cfg ON (a.dunning_config_id = cfg.id)
LEFT JOIN dunning_config nextcfg ON
(nextcfg.id =