projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Projekte: Leeren Reiter "Projekt-Details" entfernt.
[kivitendo-erp.git]
/
sql
/
Pg-upgrade2
/
umstellung_eur.pl
diff --git
a/sql/Pg-upgrade2/umstellung_eur.pl
b/sql/Pg-upgrade2/umstellung_eur.pl
index
0f76060
..
0b88400
100644
(file)
--- a/
sql/Pg-upgrade2/umstellung_eur.pl
+++ b/
sql/Pg-upgrade2/umstellung_eur.pl
@@
-20,7
+20,7
@@
sub run {
foreach my $column (qw(accounting_method inventory_system profit_determination)) {
# this query will fail if columns already exist (new database)
foreach my $column (qw(accounting_method inventory_system profit_determination)) {
# this query will fail if columns already exist (new database)
- $self->db_query(qq|ALTER TABLE defaults ADD COLUMN ${column} TEXT|, 1);
+ $self->db_query(qq|ALTER TABLE defaults ADD COLUMN ${column} TEXT|,
may_fail =>
1);
}
my $accounting_method;
}
my $accounting_method;
@@
-30,7
+30,7
@@
sub run {
# check current configuration and set default variables accordingly, so that
# kivitendo behaviour isn't changed by this update
# check current configuration and set default variables accordingly, so that
# kivitendo behaviour isn't changed by this update
- if ($::lx_office_conf{system}->{eur} == 0 ) {
+ if (
!defined $::lx_office_conf{system}->{eur} ||
$::lx_office_conf{system}->{eur} == 0 ) {
$accounting_method = 'accrual';
$inventory_system = 'perpetual';
$profit_determination = 'balance';
$accounting_method = 'accrual';
$inventory_system = 'perpetual';
$profit_determination = 'balance';