X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=28e12258a2564558bd1f69c3285859eb51583e95;hb=b354d72972e377a3007f8f03ad9b719488c4b3bf;hp=8a4ecbf8d94e43c5c38f23d09eece4ffe92bcf89;hpb=66ddc388f22a78ff14f7705a0d3d601e81440e04;p=kivitendo-erp.git diff --git a/SL/Form.pm b/SL/Form.pm index 8a4ecbf8d..28e12258a 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -1204,6 +1204,7 @@ sub parse_template { local (*IN, *OUT); my $userspath = $::lx_office_conf{paths}->{userspath}; + $self->{"cwd"} = getcwd(); $self->{"tmpdir"} = $self->{cwd} . "/${userspath}"; @@ -1295,7 +1296,6 @@ sub parse_template { $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()); @@ -2381,7 +2381,7 @@ $main::lxdebug->enter_sub(); $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);