From 4237fa95121ce0dadf032efd9429c3946f4de56d Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 4 Mar 2020 14:49:27 +0000 Subject: [PATCH] Bug 24081: DBRev 19.12.00.034 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_24081.perl | 26 ----------------- installer/data/mysql/updatedatabase.pl | 29 +++++++++++++++++++ 3 files changed, 30 insertions(+), 27 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24081.perl diff --git a/Koha.pm b/Koha.pm index 69510145fc..8522d6683f 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 = "19.12.00.033"; +$VERSION = "19.12.00.034"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_24081.perl b/installer/data/mysql/atomicupdate/bug_24081.perl deleted file mode 100644 index a81fdc6a19..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24081.perl +++ /dev/null @@ -1,26 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if ( CheckVersion($DBversion) ) { - - $dbh->do( - qq{ - INSERT IGNORE INTO account_credit_types (code, description, can_be_added_manually, is_system) - VALUES - ('DISCOUNT', 'A discount applied to a patrons fine', 0, 1) - } - ); - - $dbh->do(qq{ - INSERT IGNORE INTO account_offset_types ( type ) VALUES ('DISCOUNT'); - }); - - $dbh->do(qq{ - INSERT IGNORE permissions (module_bit, code, description) - VALUES - (10, 'discount', 'Perform account discount action') - }); - - SetVersion($DBversion); - print "Upgrade to $DBversion done (Bug 24081 - Add DISCOUNT to account_credit_types)\n"; - print "Upgrade to $DBversion done (Bug 24081 - Add DISCOUNT to account_offset_types)\n"; - print "Upgrade to $DBversion done (Bug 24081 - Add accounts discount permission)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 7140b95c49..e351731543 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -21004,6 +21004,35 @@ if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done (Bug 23355 - Add cash register cashup permissions)\n"; } +$DBversion = '19.12.00.033'; +if ( CheckVersion($DBversion) ) { + + $dbh->do( + qq{ + INSERT IGNORE INTO account_credit_types (code, description, can_be_added_manually, is_system) + VALUES + ('DISCOUNT', 'A discount applied to a patrons fine', 0, 1) + } + ); + + $dbh->do( + qq{ + INSERT IGNORE INTO account_offset_types ( type ) VALUES ('DISCOUNT'); + } + ); + + $dbh->do( + qq{ + INSERT IGNORE permissions (module_bit, code, description) + VALUES + (10, 'discount', 'Perform account discount action') + } + ); + + SetVersion($DBversion); + print "Upgrade to $DBversion done (Bug 24081 - Add DISCOUNT to account_credit_types and account_offset_types, Add accounts discount permission)\n"; +} + # 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.39.5