projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sprache auf ungültig setzen im Admin-Bereich
[kivitendo-erp.git]
/
SL
/
Common.pm
diff --git
a/SL/Common.pm
b/SL/Common.pm
index
fb1b4b8
..
126a30e
100644
(file)
--- a/
SL/Common.pm
+++ b/
SL/Common.pm
@@
-25,6
+25,7
@@
use Encode qw(decode);
use SL::DBUtils;
use SL::DB;
use SL::DBUtils;
use SL::DB;
+use SL::HTML::Util;
sub unique_id {
my ($a, $b) = gettimeofday();
sub unique_id {
my ($a, $b) = gettimeofday();
@@
-342,6
+343,11
@@
sub get_vc_details {
$query = qq|SELECT * FROM shipto WHERE (trans_id = ?)|;
$form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $vc_id);
$query = qq|SELECT * FROM shipto WHERE (trans_id = ?)|;
$form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $vc_id);
+ if ($vc eq 'customer') {
+ $query = qq|SELECT * FROM additional_billing_addresses WHERE (customer_id = ?)|;
+ $form->{ADDITIONAL_BILLING_ADDRESSES} = selectall_hashref_query($form, $dbh, $query, $vc_id);
+ }
+
$query = qq|SELECT * FROM contacts WHERE (cp_cv_id = ?)|;
$form->{CONTACTS} = selectall_hashref_query($form, $dbh, $query, $vc_id);
$query = qq|SELECT * FROM contacts WHERE (cp_cv_id = ?)|;
$form->{CONTACTS} = selectall_hashref_query($form, $dbh, $query, $vc_id);
@@
-382,6
+388,8
@@
sub save_email_status {
my ($self, $myconfig, $form) = @_;
my ($self, $myconfig, $form) = @_;
+ return unless ($::instance_conf->get_email_journal);
+
my ($table, $query, $dbh);
if ($form->{script} eq 'oe.pl') {
my ($table, $query, $dbh);
if ($form->{script} eq 'oe.pl') {
@@
-418,7
+426,7
@@
sub save_email_status {
. $main::locale->text('To (email)') . ": $form->{email}\n"
. "${cc}${bcc}"
. $main::locale->text('Subject') . ": $form->{subject}\n\n"
. $main::locale->text('To (email)') . ": $form->{email}\n"
. "${cc}${bcc}"
. $main::locale->text('Subject') . ": $form->{subject}\n\n"
- . $main::locale->text('Message') . ":
$form->{message}"
;
+ . $main::locale->text('Message') . ":
" . SL::HTML::Util->strip($form->{message})
;
$intnotes =~ s|\r||g;
$intnotes =~ s|\r||g;
@@
-588,8
+596,10
@@
sub copy_file_to_webdav_folder {
return;
}
return;
}
+ $form->{attachment_filename} ||= $form->generate_attachment_filename;
+
my $timestamp = get_current_formatted_time();
my $timestamp = get_current_formatted_time();
- my $new_file = File::Spec->catfile($form->{cwd}, $webdav_folder, $form->
generate_attachment_filename()
);
+ my $new_file = File::Spec->catfile($form->{cwd}, $webdav_folder, $form->
{attachment_filename}
);
$new_file =~ s{(.*)\.}{$1$timestamp\.};
if (!File::Copy::copy($current_file, $new_file)) {
$new_file =~ s{(.*)\.}{$1$timestamp\.};
if (!File::Copy::copy($current_file, $new_file)) {
@@
-638,6
+648,11
@@
C<full> (replace consecutive line feed/carriage return characters in
the middle by a single space and remove tailing line feed/carriage
return characters).
the middle by a single space and remove tailing line feed/carriage
return characters).
+=item C<save_email_status>
+
+Adds sending information to internal notes.
+Does nothing if the client config email_journal is enabled.
+
=back
=head1 BUGS
=back
=head1 BUGS