X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=84d64bd9fad82eba4538c5079e440c6bf55b6e0c;hb=2a9bd2a21be7b2961887ca0dbaac1ff789df10a4;hp=6c8bbe9cf9db7b5d4368b76c245f76537f886103;hpb=325263e0e52dce7d3aca5e6a3062a8afd622a454;p=kivitendo-erp.git diff --git a/SL/Form.pm b/SL/Form.pm index 6c8bbe9cf..84d64bd9f 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -507,6 +507,7 @@ sub header { 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|| } @@ -2545,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