Entfernt dpt_trans

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 23ee185551b181e8d28cfecf95aa112a59289c30..6a6dc9c21886c95c707ec37dab9660538c0afc8c 100644 (file)
--- 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
   $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
   );
     jquery-ui.custom
     js/jscalendar/calendar-win2k-1
   );


@@ -490,10 +490,12 @@ sub header {
     push @header, "<meta http-equiv='refresh' content='$refresh_time;$refresh_url'>";
   }
 
     push @header, "<meta http-equiv='refresh' content='$refresh_time;$refresh_url'>";
   }
 

-  push @header, map { qq|<link rel="stylesheet" href="$_" type="text/css" title="Stylesheet">| } $layout->stylesheets;
+  my $auto_reload_resources_param = $layout->auto_reload_resources_param;
+
+  push @header, map { qq|<link rel="stylesheet" href="${_}${auto_reload_resources_param}" type="text/css" title="Stylesheet">| } $layout->stylesheets;

   push @header, "<style type='text/css'>\@page { size:landscape; }</style> "                     if $self->{landscape};
   push @header, "<link rel='shortcut icon' href='$self->{favicon}' type='image/x-icon'>"         if -f $self->{favicon};
   push @header, "<style type='text/css'>\@page { size:landscape; }</style> "                     if $self->{landscape};
   push @header, "<link rel='shortcut icon' href='$self->{favicon}' type='image/x-icon'>"         if -f $self->{favicon};

-  push @header, map { qq|<script type="text/javascript" src="$_"></script>| }                    $layout->javascripts;
+  push @header, map { qq|<script type="text/javascript" src="${_}${auto_reload_resources_param}"></script>| }                    $layout->javascripts;

   push @header, $self->{javascript} if $self->{javascript};
   push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
 
   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, ...)
   # 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);
 
   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 = '';
   }
 
   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 =
 
   if ($self->{id}) {
     $query =