From 50ebed51ee160992e22cde55dcd657beb7429f8f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 30 Jul 2020 15:21:50 +0000 Subject: [PATCH] Bug 24157: DBRev 20.06.00.018 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_24157.perl | 30 ------------------------ installer/data/mysql/updatedatabase.pl | 30 ++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24157.perl diff --git a/Koha.pm b/Koha.pm index b212543b28..d4414eff03 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.017"; +$VERSION = "20.06.00.018"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_24157.perl b/installer/data/mysql/atomicupdate/bug_24157.perl deleted file mode 100644 index 7a7bad0327..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24157.perl +++ /dev/null @@ -1,30 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(q| - INSERT IGNORE INTO permissions (module_bit, code, description) VALUES - (11, 'reopen_closed_invoices', 'Reopen closed invoices') - |); - - $dbh->do(q| - INSERT IGNORE INTO permissions (module_bit, code, description) VALUES - (11, 'edit_invoices', 'Edit invoices') - |); - - $dbh->do(q| - INSERT IGNORE INTO permissions (module_bit, code, description) VALUES - (11, 'delete_baskets', 'Delete baskets') - |); - - $dbh->do(q| - INSERT IGNORE INTO permissions (module_bit, code, description) VALUES - (11, 'delete_invoices', 'Delete invoices') - |); - - $dbh->do(q| - INSERT IGNORE INTO permissions (module_bit, code, description) VALUES - (11, 'merge_invoices', 'Merge invoices') - |); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 24157: Add new permissions reopen_closed_invoices, edit_invoices, delete_invoices, merge_invoices, delete_baskets)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 2c66c5b130..bcd5b4dd9b 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -22498,6 +22498,36 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 25709, "Rename systempreference to NotesToHide"); } +$DBversion = '20.06.00.018'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q| + INSERT IGNORE INTO permissions (module_bit, code, description) VALUES + (11, 'reopen_closed_invoices', 'Reopen closed invoices') + |); + + $dbh->do(q| + INSERT IGNORE INTO permissions (module_bit, code, description) VALUES + (11, 'edit_invoices', 'Edit invoices') + |); + + $dbh->do(q| + INSERT IGNORE INTO permissions (module_bit, code, description) VALUES + (11, 'delete_baskets', 'Delete baskets') + |); + + $dbh->do(q| + INSERT IGNORE INTO permissions (module_bit, code, description) VALUES + (11, 'delete_invoices', 'Delete invoices') + |); + + $dbh->do(q| + INSERT IGNORE INTO permissions (module_bit, code, description) VALUES + (11, 'merge_invoices', 'Merge invoices') + |); + + NewVersion( $DBversion, 24157, "Add new permissions reopen_closed_invoices, edit_invoices, delete_invoices, merge_invoices, delete_basket"); +} + # 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.4.GIT