projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Verletzung von NOT NULL Constraints
[kivitendo-erp.git]
/
SL
/
Common.pm
diff --git
a/SL/Common.pm
b/SL/Common.pm
index
c0bca01
..
159609d
100644
(file)
--- a/
SL/Common.pm
+++ b/
SL/Common.pm
@@
-43,7
+43,7
@@
sub unique_id {
}
sub tmpname {
}
sub tmpname {
- return "/tmp/
lx-office
-tmp-" . unique_id();
+ return "/tmp/
kivitendo
-tmp-" . unique_id();
}
sub retrieve_parts {
}
sub retrieve_parts {
@@
-441,6
+441,9
@@
sub get_vc_details {
$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);
+ # Only show default pricegroup for customer, not vendor, which is why this is outside the main query
+ ($form->{pricegroup}) = selectrow_query($form, $dbh, qq|SELECT pricegroup FROM pricegroup WHERE id = ?|, $form->{klass});
+
$dbh->disconnect();
$main::lxdebug->leave_sub();
$dbh->disconnect();
$main::lxdebug->leave_sub();
@@
-496,8
+499,8
@@
sub save_email_status {
$intnotes .= "\n\n" if ($intnotes);
$intnotes .= "\n\n" if ($intnotes);
- my $cc = $
main::locale->text('Cc') . ": $form->{cc}\n" if $form->{cc}
;
- my $bcc = $
main::locale->text('Bcc') . ": $form->{bcc}\n" if $form->{bcc}
;
+ my $cc = $
form->{cc} ? $main::locale->text('Cc') . ": $form->{cc}\n" : ''
;
+ my $bcc = $
form->{bcc} ? $main::locale->text('Bcc') . ": $form->{bcc}\n" : ''
;
my $now = scalar localtime;
$intnotes .= $main::locale->text('[email]') . "\n"
my $now = scalar localtime;
$intnotes .= $main::locale->text('[email]') . "\n"