projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testfehler: Tabs entfernt
[kivitendo-erp.git]
/
SL
/
Form.pm
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
3969cbf
..
5424a7c
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-1127,10
+1127,10
@@
sub parse_template {
sub get_bcc_defaults {
my ($self, $myconfig, $mybcc) = @_;
sub get_bcc_defaults {
my ($self, $myconfig, $mybcc) = @_;
-
#
if (SL::DB::Default->get->bcc_to_login) {
-
#
$mybcc .= ", " if $mybcc;
-
#
$mybcc .= $myconfig->{email};
-
#
}
+ if (SL::DB::Default->get->bcc_to_login) {
+ $mybcc .= ", " if $mybcc;
+ $mybcc .= $myconfig->{email};
+ }
my $otherbcc = SL::DB::Default->get->global_bcc;
if ($otherbcc) {
$mybcc .= ", " if $mybcc;
my $otherbcc = SL::DB::Default->get->global_bcc;
if ($otherbcc) {
$mybcc .= ", " if $mybcc;
@@
-1212,9
+1212,9
@@
sub send_email {
}
}
foreach my $attfile ( @attfiles ) {
}
}
foreach my $attfile ( @attfiles ) {
- push @{ $mail->{attachments} }, { path =>
SL::File->get_file_path(dbfile => $attfile)
,
+ push @{ $mail->{attachments} }, { path =>
$attfile->get_file
,
id => $attfile->id,
id => $attfile->id,
- type => $attfile->
file_
mime_type,
+ type => $attfile->mime_type,
name => $attfile->file_name };
}
}
name => $attfile->file_name };
}
}