X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FUser.pm;h=a267fcd6f55afc73e020f047002672af858d7317;hb=ebc23a03b49e640a64d1b5b2c792c0bd01e6c93c;hp=a2782390864d7147f9462cc697ac423214fbe943;hpb=6ca9244cdf323b4ad216ce69e7b9516f8423b344;p=kivitendo-erp.git diff --git a/SL/User.pm b/SL/User.pm index a27823908..a267fcd6f 100644 --- a/SL/User.pm +++ b/SL/User.pm @@ -150,7 +150,6 @@ sub login { $SIG{QUIT} = 'IGNORE'; $self->dbupdate2(form => $form, updater => $dbupdater, database => $::auth->client->{dbname}); - SL::DBUpgrade2->new(form => $::form, auth => 1)->apply_admin_dbupgrade_scripts(0); SL::System::InstallationLock->unlock; @@ -273,7 +272,7 @@ sub dbcreate { # load chart of accounts $dbupdater->process_query($dbh, "sql/$form->{chart}-chart.sql"); - my $query = qq|UPDATE defaults SET coa = ?, accounting_method = ?, profit_determination = ?, inventory_system = ?, curr = ?|; + $query = qq|UPDATE defaults SET coa = ?, accounting_method = ?, profit_determination = ?, inventory_system = ?, curr = ?|; do_query($form, $dbh, $query, map { $form->{$_} } qw(chart accounting_method profit_determination inventory_system defaultcurrency)); $dbh->disconnect; @@ -298,27 +297,6 @@ sub dbdelete { $main::lxdebug->leave_sub(); } -sub dbsources_unused { - $main::lxdebug->enter_sub(); - - my ($self, $form) = @_; - - my %dbexcl = map { $_->dbname => 1 } - grep { ($_->dbhost eq $form->{dbhost}) && ($_->dbport eq $form->{dbport}) } - @{ SL::DB::Manager::AuthClient->get_all }; - - $form->{only_acc_db} = 1; - - $dbexcl{$form->{dbdefault}} = 1; - $dbexcl{$main::auth->{DB_config}->{db}} = 1; - - my @dbunused = grep { !$dbexcl{$_} } dbsources("", $form); - - $main::lxdebug->leave_sub(); - - return @dbunused; -} - sub calc_version { $main::lxdebug->enter_sub(2); @@ -341,7 +319,7 @@ sub calc_version { sub cmp_script_version { my ($a_from, $a_to, $b_from, $b_to); my ($i, $res_a, $res_b); - my ($my_a, $my_b) = ($a, $b); + my ($my_a, $my_b) = do { no warnings 'once'; ($a, $b) }; $my_a =~ s/.*-upgrade-//; $my_a =~ s/.sql$//;