X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/b3b1b699c773418dd0e9319220d99d65630f35be..fef43fa5867d3389a5e967dd758545b7a3904f00:/SL/Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index f100b8c90..0c291dabe 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2521,7 +2521,7 @@ sub all_vc {
 
   $table = $table eq "customer" ? "customer" : "vendor";
 
-  my $query = qq|SELECT count(*) FROM $table|;
+  my $query = qq|SELECT count(*) FROM $table WHERE NOT obsolete|;
   my ($count) = selectrow_query($self, $dbh, $query);
 
   # build selection list
@@ -2857,7 +2857,7 @@ sub create_links {
     if ($self->{"$self->{vc}_id"}) {
 
       # only setup currency
-      ($self->{currency}) = split(/:/, $self->{currencies});
+      ($self->{currency}) = split(/:/, $self->{currencies}) if !$self->{currency};
 
     } else {