From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 14 Mar 2012 10:11:23 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~345^2~1
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/2a9bd2a21be7b2961887ca0dbaac1ff789df10a4?ds=inline;hp=-c

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

2a9bd2a21be7b2961887ca0dbaac1ff789df10a4
diff --combined SL/Form.pm
index 5af5ea196,050614d56..84d64bd9f
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@@ -507,7 -507,6 +507,7 @@@ sub header 
    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="js/$_.js"></script>| }
         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|<link rel="stylesheet" type="text/css" href="$css_path/$_.css">| }
         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|<link rel="stylesheet" type="text/css" href="js/jscalendar/calendar-win2k-1.css">| }
@@@ -2546,14 -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