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

diff --git a/SL/Controller/BackgroundJob.pm b/SL/Controller/BackgroundJob.pm
index 0ff74590ad5b798d8aff64d524c4413d623d1674..b688297971b088d392a8f0fb332c09bb545d4c5f 100644 (file)
--- 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 aed7081b3e073be64d94212e19f81d1d3d91ee97..e8f412a61399aeef9309db85f90aeb6a03e9f174 100644 (file)
--- 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;
     };