From 5115ee767d9ee47992eb8bb3c1f11bb06174a208 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 21 Mar 2019 18:11:29 +0000 Subject: [PATCH] Bug 18736: DBRev 18.11.03.004 Signed-off-by: Nick Clemens (cherry picked from commit bc36d8e06b3b43b09b655718f7fad5a1780b246a) Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../mysql/atomicupdate/bug18736_add_rounding_syspref.perl | 7 ------- installer/data/mysql/updatedatabase.pl | 8 ++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug18736_add_rounding_syspref.perl diff --git a/Koha.pm b/Koha.pm index 515c0007b4..8f0ad7174f 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 = "18.11.03.003"; +$VERSION = "18.11.03.004"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug18736_add_rounding_syspref.perl b/installer/data/mysql/atomicupdate/bug18736_add_rounding_syspref.perl deleted file mode 100644 index 1f3e249389..0000000000 --- a/installer/data/mysql/atomicupdate/bug18736_add_rounding_syspref.perl +++ /dev/null @@ -1,7 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('OrderPriceRounding',NULL,'Local preference for rounding orders before calculations to ensure correct calculations','|nearest_cent','Choice')" ); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 18736 - Add syspref to control order rounding)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 7f09cd72a1..f64ef5dd70 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -17336,6 +17336,14 @@ if( CheckVersion( $DBversion ) ) { print "WARNING: (Bug 21846) You need to manually run $maintenance_script to fix possible issues with tags.\n"; } +$DBversion = '18.11.03.004'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('OrderPriceRounding',NULL,'Local preference for rounding orders before calculations to ensure correct calculations','|nearest_cent','Choice')" ); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 18736 - Add syspref to control order rounding)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.2