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

[mfinanz.git] / SL / User.pm

diff --git a/SL/User.pm b/SL/User.pm
index 46c35bf41c725c9c3482659763fab49db5587038..871a453f70513f2fbd68aaecdf6cc6d7a55b36cb 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -137,7 +137,7 @@ sub login {
 
     if ($update_available) {
       $form->{"title"} = $main::locale->text("Dataset upgrade");
 
     if ($update_available) {
       $form->{"title"} = $main::locale->text("Dataset upgrade");

-      $form->header();
+      $form->header(no_layout => $form->{no_layout});

       print $form->parse_html_template("dbupgrade/header");
 
       $form->{dbupdate} = "db$myconfig{dbname}";
       print $form->parse_html_template("dbupgrade/header");
 
       $form->{dbupdate} = "db$myconfig{dbname}";


@@ -398,6 +398,8 @@ sub dbcreate {
   do_query($form, $dbh, $query, $form->{profit_determination});
   $query = "UPDATE defaults SET inventory_system = ?";
   do_query($form, $dbh, $query, $form->{inventory_system});
   do_query($form, $dbh, $query, $form->{profit_determination});
   $query = "UPDATE defaults SET inventory_system = ?";
   do_query($form, $dbh, $query, $form->{inventory_system});

+  $query = "UPDATE defaults SET curr = ?";
+  do_query($form, $dbh, $query, $form->{defaultcurrency});

 
   $dbh->disconnect;
 
 
   $dbh->disconnect;