Aktualisierung der Dokumentation zur Verwendung von OpenDocument-Vorlagen und der...

[mfinanz.git] / SL / User.pm

diff --git a/SL/User.pm b/SL/User.pm
index 24774db20b9a9662b25fa51efc2060fbf9253ebc..f331ca4af15f491e3b79946cee539165bfec0270 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -168,21 +168,25 @@ sub login {
 
     if (&update_available($myconfig{"dbdriver"}, $dbversion)) {
 
 
     if (&update_available($myconfig{"dbdriver"}, $dbversion)) {
 

-      # update the tables
-      open FH, ">$userspath/nologin" or die "
-$!";
-

       map { $form->{$_} = $myconfig{$_} }
         qw(dbname dbhost dbport dbdriver dbuser dbpasswd dbconnect);
 
       map { $form->{$_} = $myconfig{$_} }
         qw(dbname dbhost dbport dbdriver dbuser dbpasswd dbconnect);
 

-      $form->{dbupdate} = "db$myconfig{dbname}";
-      $form->{ $form->{dbupdate} } = 1;
-

       $form->{"stylesheet"} = "lx-office-erp.css";
       $form->{"title"} = $main::locale->text("Dataset upgrade");
       $form->header();
       $form->{"stylesheet"} = "lx-office-erp.css";
       $form->{"title"} = $main::locale->text("Dataset upgrade");
       $form->header();

-      print($form->parse_html_template("dbupgrade/header",
-                                       { "dbname" => $myconfig{dbname} }));
+      print($form->parse_html_template("dbupgrade/header"));
+
+      $form->{dbupdate} = "db$myconfig{dbname}";
+      $form->{ $form->{dbupdate} } = 1;
+
+      if ($form->{"show_dbupdate_warning"}) {
+        print($form->parse_html_template("dbupgrade/warning"));
+        exit(0);
+      }
+
+      # update the tables
+      open FH, ">$userspath/nologin" or die "
+$!";

 
       # required for Oracle
       $form->{dbdefault} = $sid;
 
       # required for Oracle
       $form->{dbdefault} = $sid;


@@ -388,6 +392,9 @@ sub dbcreate {
   $filename = qq|sql/$form->{chart}-chart.sql|;
   $self->process_query($form, $dbh, $filename);
 
   $filename = qq|sql/$form->{chart}-chart.sql|;
   $self->process_query($form, $dbh, $filename);
 

+  $query = "UPDATE defaults SET coa = " . $dbh->quote($form->{"chart"});
+  $dbh->do($query) || $form->dberror($query);
+

   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();