use SL::Iconv;
use SL::Inifile;
use SL::System::InstallationLock;
+use SL::DefaultManager;
use strict;
return LOGIN_OK();
}
+ # Store the fact that we're applying database upgrades at the
+ # moment. That way functions called from the layout modules that may
+ # require updated tables can chose only to use basic features.
+ $::request->applying_database_upgrades(1);
+
$form->{$_} = $::auth->client->{$_} for qw(dbname dbhost dbport dbuser dbpasswd);
$form->{$_} = $myconfig{$_} for qw(datestyle);
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
# 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
&dbconnect_vars($form, $form->{db});
+ # make a shim myconfig so that rose db connections work
+ $::myconfig{$_} = $form->{$_} for qw(dbhost dbport dbuser dbpasswd);
+ $::myconfig{dbname} = $form->{db};
+
$dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options)
or $form->dberror;
- my $dbupdater = SL::DBUpgrade2->new(form => $form);
+ my $dbupdater = SL::DBUpgrade2->new(form => $form, return_on_error => 1, silent => 1)->parse_dbupdate_controls;
# create the tables
$dbupdater->process_query($dbh, "sql/lx-office.sql");
-
- # load chart of accounts
$dbupdater->process_query($dbh, "sql/$form->{chart}-chart.sql");
- $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));
+ $query = qq|UPDATE defaults SET coa = ?|;
+ do_query($form, $dbh, $query, map { $form->{$_} } qw(chart));
+
+ $dbh->disconnect;
+
+ # update new database
+ $self->dbupdate2(form => $form, updater => $dbupdater, database => $form->{db}, silent => 1);
+
+ $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options)
+ or $form->dberror;
+
+ $query = "SELECT * FROM currencies WHERE name = ?";
+ my $curr = selectfirst_hashref_query($form, $dbh, $query, $form->{defaultcurrency});
+ if (!$curr->{id}) {
+ do_query($form, $dbh, "INSERT INTO currencies (name) VALUES (?)", $form->{defaultcurrency});
+ $curr = selectfirst_hashref_query($form, $dbh, $query, $form->{defaultcurrency});
+ }
+
+ $query = qq|UPDATE defaults SET accounting_method = ?, profit_determination = ?, inventory_system = ?, precision = ?, currency_id = ?|;
+ do_query($form, $dbh, $query,
+ $form->{accounting_method},
+ $form->{profit_determination},
+ $form->{inventory_system},
+ $form->parse_amount(\%::myconfig, $form->{precision_as_number}),
+ $curr->{id},
+ );
$dbh->disconnect;
my $form = $params{form};
my $dbupdater = $params{updater};
my $db = $params{database};
+ my $silent = $params{silent};
map { $_->{description} = SL::Iconv::convert($_->{charset}, 'UTF-8', $_->{description}) } values %{ $dbupdater->{all_controls} };
&dbconnect_vars($form, $db);
# Flush potentially held database locks.
- $form->get_standard_dbh->commit;
+# $form->get_standard_dbh->commit;
my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror;
# been applied correctly and if the update has not requested user
# interaction.
$main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}");
- print $form->parse_html_template("dbupgrade/upgrade_message2", $control);
+ print $form->parse_html_template("dbupgrade/upgrade_message2", $control) unless $silent;
$dbupdater->process_file($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
}
sub get_default_myconfig {
my ($self_or_class, %user_config) = @_;
+ my $defaults = SL::DefaultManager->new($::lx_office_conf{system}->{default_manager});
return (
- countrycode => 'de',
+ countrycode => $defaults->language('de'),
css_path => 'css', # Needed for menunew, see SL::Layout::Base::get_stylesheet_for_user
- dateformat => 'dd.mm.yy',
- numberformat => '1.000,00',
- stylesheet => 'kivitendo.css',
- timeformat => 'hh:mm',
+ dateformat => $defaults->dateformat('dd.mm.yy'),
+ numberformat => $defaults->numberformat('1.000,00'),
+ stylesheet => $defaults->stylesheet('kivitendo.css'),
+ timeformat => $defaults->timeformat('hh:mm'),
%user_config,
);
}