From: Jan Büren <jan@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 09:59:55 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~53^2^2~4
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/4624b92aaf7520ff7f2d1ca6aa9abb295d1e01ca?hp=08c79c2c65b17701c1f42d9a2b4623d7bd806120

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

diff --git a/SL/Controller/BackgroundJob.pm b/SL/Controller/BackgroundJob.pm
index 0ff74590a..b68829797 100644
--- a/SL/Controller/BackgroundJob.pm
+++ b/SL/Controller/BackgroundJob.pm
@@ -167,6 +167,9 @@ sub init_models {
       last_run_at  => t8('Last run at'),
       next_run_at  => t8('Next run at'),
     },
+    query => [
+      package_name => [ SL::BackgroundJob::Base->get_known_job_classes ],
+    ],
   );
 }
 
diff --git a/js/kivi.CustomerVendor.js b/js/kivi.CustomerVendor.js
index aed7081b3..e8f412a61 100644
--- a/js/kivi.CustomerVendor.js
+++ b/js/kivi.CustomerVendor.js
@@ -105,7 +105,7 @@ namespace('kivi.CustomerVendor', function(ns) {
 
     var isNotEmpty = function() {
       for(var i in $mapSearchElements)
-        if( $mapSearchElements[i].val() == '' )
+        if( ($mapSearchElements[i].attr('id') != prefix + 'country') && ($mapSearchElements[i].val() == '') )
           return false;
       return true;
     };