X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FUser.pm;h=44efe5c58eae94028255c3eeae10f8e607a2d519;hb=30e4ba28a7352159bb3e829b073540d579f55c18;hp=42622f8fdc5d81c9684f840cea1052069aa80993;hpb=fa7fc7eeb3ca718914affee06c0629a08d571288;p=kivitendo-erp.git

diff --git a/SL/User.pm b/SL/User.pm
index 42622f8fd..44efe5c58 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -124,10 +124,10 @@ sub login {
   $self->create_schema_info_table($form, $dbh);
 
   my $dbupdater        = SL::DBUpgrade2->new(form => $form)->parse_dbupdate_controls;
-  my $update_available = $dbupdater->update2_available($dbh);
+  my @unapplied_scripts = $dbupdater->unapplied_upgrade_scripts($dbh);
   $dbh->disconnect;
 
-  if (!$update_available) {
+  if (!@unapplied_scripts) {
     SL::DB::Manager::Employee->update_entries_for_authorized_users;
     return LOGIN_OK();
   }
@@ -142,7 +142,7 @@ sub login {
   $form->{dbupdate} = "db" . $::auth->client->{dbname};
 
   if ($form->{"show_dbupdate_warning"}) {
-    print $form->parse_html_template("dbupgrade/warning");
+    print $form->parse_html_template("dbupgrade/warning", { unapplied_scripts => \@unapplied_scripts });
     ::end_of_request();
   }
 
@@ -412,4 +412,18 @@ sub data {
   +{ %{ $_[0] } }
 }
 
+sub get_default_myconfig {
+  my ($self_or_class, %user_config) = @_;
+
+  return (
+    countrycode  => 'de',
+    css_path     => 'css',      # Needed for menunew, see SL::Layout::Base::get_stylesheet_for_user
+    dateformat   => 'dd.mm.yy',
+    numberformat => '1.000,00',
+    stylesheet   => 'kivitendo.css',
+    timeformat   => 'hh:mm',
+    %user_config,
+  );
+}
+
 1;