X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FForm.pm;h=8d28f845b869a38afe3348df0669eb9dc06a86a2;hb=76a2823e654382ba101b4a611dd351a8c87034a1;hp=5af5ea196f0237836655fb1c625b8457261e091b;hpb=c07a3eed7e1913be0801dda4d10802ce8b7d275d;p=kivitendo-erp.git diff --git a/SL/Form.pm b/SL/Form.pm index 5af5ea196..8d28f845b 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -501,7 +501,7 @@ 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}; @@ -595,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}; @@ -1114,7 +1114,7 @@ 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, @@ -2546,14 +2546,14 @@ sub all_vc { $table = $table eq "customer" ? "customer" : "vendor"; - my $query = qq|SELECT count(*) FROM $table WHERE NOT obsolete|; - my ($count) = selectrow_query($self, $dbh, $query); - # build selection list # Hotfix für Bug 1837 - Besser wäre es alte Buchungsbelege # 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 $obsolete|; + my ($count) = selectrow_query($self, $dbh, $query); + if ($count < $myconfig->{vclimit}) { $query = qq|SELECT id, name, salesman_id FROM $table $obsolete