X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/5f68c97560deb16f78ab3331e13e692981bc2c1e..b8fee3fc:/SL/Form.pm
diff --git a/SL/Form.pm b/SL/Form.pm
index 23ee18555..6a6dc9c21 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -469,7 +469,7 @@ sub header {
$layout->use_stylesheet("$_.css") for qw(
main menu list_accounts jquery.autocomplete
jquery.multiselect2side frame_header/header
- ui-lightness/jquery-ui-1.8.12.custom
+ ui-lightness/jquery-ui
jquery-ui.custom
js/jscalendar/calendar-win2k-1
);
@@ -490,10 +490,12 @@ sub header {
push @header, "";
}
- push @header, map { qq|| } $layout->stylesheets;
+ my $auto_reload_resources_param = $layout->auto_reload_resources_param;
+
+ push @header, map { qq|| } $layout->stylesheets;
push @header, " " if $self->{landscape};
push @header, "" if -f $self->{favicon};
- push @header, map { qq|| } $layout->javascripts;
+ push @header, map { qq|| } $layout->javascripts;
push @header, $self->{javascript} if $self->{javascript};
push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
@@ -2529,7 +2531,7 @@ sub all_vc {
# 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 $obsolete = $self->{id} ? '' : "WHERE NOT obsolete";
my $query = qq|SELECT count(*) FROM $table $obsolete|;
my ($count) = selectrow_query($self, $dbh, $query);
@@ -2730,7 +2732,7 @@ sub create_links {
}
my $extra_columns = '';
- $extra_columns .= 'a.direct_debit, ' if $module eq 'AR';
+ $extra_columns .= 'a.direct_debit, ' if ($module eq 'AR') || ($module eq 'AP');
if ($self->{id}) {
$query =