X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/dbcf08e9ecb0591f68cc8ee59af7fc8ba9aa62e1..2721bfd0fac27ee0fcb0c92861a2837c69c9d793:/SL/User.pm

diff --git a/SL/User.pm b/SL/User.pm
index 37e1a9b5f..742cb3a2a 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -149,7 +149,7 @@ sub login {
 
   if ($form->{"show_dbupdate_warning"}) {
     print $form->parse_html_template("dbupgrade/warning", { unapplied_scripts => \@unapplied_scripts });
-    ::end_of_request();
+    $::dispatcher->end_request;
   }
 
   # update the tables
@@ -164,7 +164,7 @@ sub login {
   # If $self->dbupdate2 returns than this means all upgrade scripts
   # have been applied successfully, none required user
   # interaction. Otherwise the deeper layers would have called
-  # ::end_of_request() already, and return would not have returned to
+  # $::dispatcher->end_request already, and return would not have returned to
   # us. Therefore we can now use RDBO instances because their supposed
   # table structures do match the actual structures. So let's ensure
   # that the "employee" table contains the appropriate entries for all
@@ -312,13 +312,29 @@ sub dbcreate {
     $curr = selectfirst_hashref_query($form, $dbh, $query, $form->{defaultcurrency});
   }
 
-  $query = qq|UPDATE defaults SET accounting_method = ?, profit_determination = ?, inventory_system = ?, precision = ?, currency_id = ?|;
+  $query = qq|UPDATE defaults SET
+    accounting_method = ?,
+    profit_determination = ?,
+    inventory_system = ?,
+    precision = ?,
+    currency_id = ?,
+    feature_balance = ?,
+    feature_datev = ?,
+    feature_erfolgsrechnung = ?,
+    feature_eurechnung = ?,
+    feature_ustva = ?
+  |;
   do_query($form, $dbh, $query,
     $form->{accounting_method},
     $form->{profit_determination},
     $form->{inventory_system},
     $form->parse_amount(\%::myconfig, $form->{precision_as_number}),
     $curr->{id},
+    $form->{feature_balance},
+    $form->{feature_datev},
+    $form->{feature_erfolgsrechnung},
+    $form->{feature_eurechnung},
+    $form->{feature_ustva}
   );
 
   $dbh->disconnect;