X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FForm.pm;h=849167363a05dcdde05e4cd920b1adad5ea79451;hb=dc3f6120f9bbacaa028e554d7fa71e481d4497b4;hp=07e3d3e6be17fa8bfee2f1c076fba1e89135058e;hpb=9faa9827bb822e0b6af9de8ce37cc72fa3941a91;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index 07e3d3e6b..849167363 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -501,12 +501,13 @@ sub header {
push @header, "";
}
- push @header, map { qq|| } $self->use_stylesheet;
+ push @header, map { qq|| } $self->use_stylesheet;
push @header, "" if $self->{landscape};
push @header, "" if -f $self->{favicon};
push @header, map { qq|| }
qw(jquery common jscalendar/calendar jscalendar/lang/calendar-de jscalendar/calendar-setup part_selection jquery-ui jqModal switchmenuframe);
+ push @header, $self->{javascript} if $self->{javascript};
push @header, map { qq|| }
qw(main menu tabcontent list_accounts jquery.autocomplete jquery.multiselect2side frame_header/header ui-lightness/jquery-ui-1.8.12.custom);
push @header, map { qq|| }
@@ -594,7 +595,7 @@ sub set_standard_title {
$::lxdebug->enter_sub;
my $self = shift;
- $self->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $self->{version}";
+ $self->{titlebar} = "kivitendo " . $::locale->text('Version') . " $self->{version}";
$self->{titlebar} .= "- $::myconfig{name}" if $::myconfig{name};
$self->{titlebar} .= "- $::myconfig{dbname}" if $::myconfig{name};
@@ -1113,10 +1114,10 @@ sub parse_template {
$suffix = $self->{IN};
$suffix =~ s/.*\.//;
($temp_fh, $self->{tmpfile}) = File::Temp::tempfile(
- 'lx-office-printXXXXXX',
+ 'kivitendo-printXXXXXX',
SUFFIX => '.' . ($suffix || 'tex'),
DIR => $userspath,
- UNLINK => 1,
+ UNLINK => ($::lx_office_conf{debug} && $::lx_office_conf{debug}->{keep_temp_files})? 0 : 1,
);
close $temp_fh;
@@ -2550,7 +2551,7 @@ sub all_vc {
# OHNE Auswahlliste (reines Textfeld) zu laden. Hilft aber auch
# nicht für veränderbare Belege (oe, do, ...)
my $obsolete = "WHERE NOT obsolete" unless $self->{id};
- my $query = qq|SELECT count(*) FROM $table WHERE NOT $obsolete|;
+ my $query = qq|SELECT count(*) FROM $table $obsolete|;
my ($count) = selectrow_query($self, $dbh, $query);
if ($count < $myconfig->{vclimit}) {