From 3bd2c3cf3a56cb61e107de2899c8324f1a5c5ec7 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 3 Jan 2020 16:46:23 +0000 Subject: [PATCH] Bug 24080: DBRev 19.12.00.004 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_24080.perl | 32 ------------------ installer/data/mysql/updatedatabase.pl | 33 +++++++++++++++++++ 3 files changed, 34 insertions(+), 33 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24080.perl diff --git a/Koha.pm b/Koha.pm index 43fe22c8f7..34a8f8ce62 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.003"; +$VERSION = "19.12.00.004"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_24080.perl b/installer/data/mysql/atomicupdate/bug_24080.perl deleted file mode 100644 index 514317ff8d..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24080.perl +++ /dev/null @@ -1,32 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if ( CheckVersion($DBversion) ) { - - $dbh->do( - qq{ - INSERT IGNORE INTO account_debit_types ( - code, - description, - can_be_added_manually, - default_amount, - is_system - ) - VALUES - ('PAYOUT', 'Payment from library to patron', 0, NULL, 1) - } - ); - - $dbh->do(qq{ - INSERT IGNORE INTO account_offset_types ( type ) VALUES ('PAYOUT'); - }); - - $dbh->do(qq{ - INSERT IGNORE permissions (module_bit, code, description) - VALUES - (10, 'payout', 'Perform account payout action') - }); - - SetVersion($DBversion); - print "Upgrade to $DBversion done (Bug 24080 - Add PAYOUT account_debit_type)\n"; - print "Upgrade to $DBversion done (Bug 24080 - Add PAYOUT account_offset_type)\n"; - print "Upgrade to $DBversion done (Bug 24080 - Add accounts payout permission)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d61b4e8cd5..02c5a3ea28 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20270,6 +20270,39 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 22284 - Add ft_local_hold_group column to library_groups)\n"; } +$DBversion = '19.12.00.004'; +if ( CheckVersion($DBversion) ) { + + $dbh->do( + qq{ + INSERT IGNORE INTO account_debit_types ( + code, + description, + can_be_added_manually, + default_amount, + is_system + ) + VALUES + ('PAYOUT', 'Payment from library to patron', 0, NULL, 1) + } + ); + + $dbh->do(qq{ + INSERT IGNORE INTO account_offset_types ( type ) VALUES ('PAYOUT'); + }); + + $dbh->do(qq{ + INSERT IGNORE permissions (module_bit, code, description) + VALUES + (10, 'payout', 'Perform account payout action') + }); + + SetVersion($DBversion); + print "Upgrade to $DBversion done (Bug 24080 - Add PAYOUT account_debit_type)\n"; + print "Upgrade to $DBversion done (Bug 24080 - Add PAYOUT account_offset_type)\n"; + print "Upgrade to $DBversion done (Bug 24080 - Add accounts payout 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.2