From b99d8add437d93d6026e2091c23df7807e842190 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 3 Sep 2020 12:20:57 +0000 Subject: [PATCH] Bug 23682: DBRev 20.06.00.035 Signed-off-by: Jonathan Druart Signed-off-by: Sally https://bugs.koha-community.org/show_bug.cgi?id=15933 --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_23682.perl | 10 ---------- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_23682.perl diff --git a/Koha.pm b/Koha.pm index 15a03c63d8..93aaaccab4 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "20.06.00.034"; +$VERSION = "20.06.00.035"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_23682.perl b/installer/data/mysql/atomicupdate/bug_23682.perl deleted file mode 100644 index 05aebbcc92..0000000000 --- a/installer/data/mysql/atomicupdate/bug_23682.perl +++ /dev/null @@ -1,10 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if ( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES - ('EdifactInvoiceImport', 'automatic', 'automatic|manual', "If on, don't auto-import EDI invoices, just keep them in the database with the status 'new'", 'Choice') - }); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug XXXXX - description)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f71c9a83f8..fb1cedf9cd 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -22759,6 +22759,16 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 24197, "Add new system preference 'AddressForFailedOverdueNotices'" ); } +$DBversion = '20.06.00.035'; +if ( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES + ('EdifactInvoiceImport', 'automatic', 'automatic|manual', "If on, don't auto-import EDI invoices, just keep them in the database with the status 'new'", 'Choice') + }); + + NewVersion( $DBversion, 23682, "Add new system preference 'EdifactInvoiceImport'" ); +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; -- 2.11.0