X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FUser.pm;h=cfa43fee312afe8670c155a0a3215b9bff3f31d8;hb=5df2b57a097f66f6cecba0aa577c7aaba3422ab6;hp=ea189637753cbd8fd45c10d4e4ec738023d5cf52;hpb=8c7e44938a661e035f62840e1e177353240ace5d;p=kivitendo-erp.git

diff --git a/SL/User.pm b/SL/User.pm
index ea1896377..cfa43fee3 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -344,7 +344,8 @@ sub dbcreate {
   my $query = $dbcreate{$form->{dbdriver}};
   $query .= " WITH " . join(" ", @{$dboptions{"Pg"}}) if (@{$dboptions{"Pg"}});
 
-  do_query($form, $dbh, $query);
+  # Ignore errors if the database exists.
+  $dbh->do($query);
 
   if ($form->{dbdriver} eq 'Oracle') {
     $query = qq|GRANT CONNECT, RESOURCE TO "$form->{db}"|;
@@ -767,7 +768,7 @@ sub dbupdate {
       last if ($version < $mindb);
 
       # apply upgrade
-      $main::lxdebug->message(DEBUG2, "Applying Update $upgradescript");
+      $main::lxdebug->message(LXDebug::DEBUG2, "Applying Update $upgradescript");
       if ($file_type eq "sql") {
         $self->process_query($form, $dbh, "sql/" . $form->{"dbdriver"} .
                              "-upgrade/$upgradescript", $str_maxdb, $db_charset);
@@ -851,7 +852,7 @@ sub dbupdate2 {
       my $file_type = $1;
 
       # apply upgrade
-      $main::lxdebug->message(DEBUG2, "Applying Update $control->{file}");
+      $main::lxdebug->message(LXDebug::DEBUG2, "Applying Update $control->{file}");
       print $form->parse_html_template("dbupgrade/upgrade_message2", $control);
 
       if ($file_type eq "sql") {
@@ -955,7 +956,8 @@ sub config_vars {
     printer role sid signature stylesheet tel templates vclimit angebote
     bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen
     taxnumber co_ustid duns menustyle template_format default_media
-    default_printer_id copies show_form_details favorites);
+    default_printer_id copies show_form_details favorites
+    pdonumber sdonumber);
 
   $main::lxdebug->leave_sub();