projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Leeren String in undef für anständige DB-Abfrage umwandeln
[kivitendo-erp.git]
/
SL
/
Form.pm
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
ae51efd
..
28e1225
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-62,6
+62,7
@@
use SL::Menu;
use SL::OE;
use SL::Template;
use SL::User;
use SL::OE;
use SL::Template;
use SL::User;
+use SL::X;
use Template;
use URI;
use List::Util qw(first max min sum);
use Template;
use URI;
use List::Util qw(first max min sum);
@@
-458,7
+459,7
@@
sub hide_form {
sub throw_on_error {
my ($self, $code) = @_;
sub throw_on_error {
my ($self, $code) = @_;
- local $self->{__ERROR_HANDLER} = sub { die
({ error => $_[0] }
) };
+ local $self->{__ERROR_HANDLER} = sub { die
SL::X::FormError->new($_[0]
) };
$code->();
}
$code->();
}
@@
-1203,6
+1204,7
@@
sub parse_template {
local (*IN, *OUT);
my $userspath = $::lx_office_conf{paths}->{userspath};
local (*IN, *OUT);
my $userspath = $::lx_office_conf{paths}->{userspath};
+
$self->{"cwd"} = getcwd();
$self->{"tmpdir"} = $self->{cwd} . "/${userspath}";
$self->{"cwd"} = getcwd();
$self->{"tmpdir"} = $self->{cwd} . "/${userspath}";
@@
-1294,7
+1296,6
@@
sub parse_template {
$result = $template->parse(*STDOUT);
}
$result = $template->parse(*STDOUT);
}
- Common::copy_file_to_webdav_folder($self) if ($self->{webdav});
if (!$result) {
$self->cleanup();
$self->error("$self->{IN} : " . $template->get_error());
if (!$result) {
$self->cleanup();
$self->error("$self->{IN} : " . $template->get_error());
@@
-2380,7
+2381,7
@@
$main::lxdebug->enter_sub();
$key = "all_payments" unless ($key);
$key = "all_payments" unless ($key);
- my $query = qq|SELECT * FROM payment_terms ORDER BY
id
|;
+ my $query = qq|SELECT * FROM payment_terms ORDER BY
sortkey
|;
$self->{$key} = selectall_hashref_query($self, $dbh, $query);
$self->{$key} = selectall_hashref_query($self, $dbh, $query);