From ded74f80e32b78fee7521735341e4c9a39a30999 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 3 Jan 2020 14:56:53 +0000 Subject: [PATCH] Bug 21633: Remove finesMode 'test' Signed-off-by: Magnus Enger Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit aab0258799f372731ec991dacb60a9f4d161126b) Signed-off-by: Lucas Gass --- .../bug_21633_remove_finesMode_test.perl | 14 ++++++++++++++ installer/data/mysql/sysprefs.sql | 2 +- .../en/modules/admin/preferences/circulation.pref | 1 - misc/cronjobs/fines.pl | 2 +- misc/cronjobs/staticfines.pl | 1 - 5 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl diff --git a/installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl b/installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl new file mode 100644 index 0000000000..7075820e17 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl @@ -0,0 +1,14 @@ +$DBversion = 'XXX'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + UPDATE systempreferences SET value = 'off' + WHERE variable = 'finesMode' and value = 'test' + }); + $dbh->do(q{ + UPDATE systempreferences SET options = 'off|production', + explanation = "Choose the fines mode, 'off' (do not accrue fines) or 'production' (accrue overdue fines). Requires accruefines cronjob or CalculateFinesOnReturn system preference." + WHERE variable = 'finesMode' + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 21633 - Remove finesMode 'test')\n"; +} diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index c4d5d2b1ab..8348d7dcb9 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -186,7 +186,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('finesCalendar','noFinesWhenClosed','ignoreCalendar|noFinesWhenClosed','Specify whether to use the Calendar in calculating duedates and fines','Choice'), ('FinesIncludeGracePeriod','1',NULL,'If enabled, fines calculations will include the grace period.','YesNo'), ('FinesLog','1',NULL,'If ON, log fines','YesNo'), -('finesMode','test','off|test|production','Choose the fines mode, \'off\', \'test\' (emails admin report) or \'production\' (accrue overdue fines). Requires accruefines cronjob.','Choice'), +('finesMode','off','off|production','Choose the fines mode, \'off\' (no charges), \'production\' (accrue overdue fines). Requires accruefines cronjob.','Choice'), ('FRBRizeEditions','0','','If ON, Koha will query one or more ISBN web services for associated ISBNs and display an Editions tab on the details pages','YesNo'), ('GDPR_Policy','','Enforced|Permissive|Disabled','General Data Protection Regulation - policy', 'Choice'), ('gist','0','','Default Goods and Services tax rate NOT in %, but in numeric form (0.12 for 12%), set to 0 to disable GST','Integer'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index 4e5e0e00be..826ff453b8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -849,7 +849,6 @@ Circulation: type: choice choices: off: "Don't calculate" - test: Calculate (but only for mailing to the admin) production: Calculate and charge - fines (when misc/cronjobs/fines.pl is being run). - "
NOTE: Fines can also be charged by the CalculateFinesOnReturn system preference." diff --git a/misc/cronjobs/fines.pl b/misc/cronjobs/fines.pl index f04da4b280..8d8c9c543e 100755 --- a/misc/cronjobs/fines.pl +++ b/misc/cronjobs/fines.pl @@ -57,7 +57,7 @@ my $usage = << 'ENDUSAGE'; This script calculates and charges overdue fines to patron accounts. The Koha system preference 'finesMode' controls whether the fines are calculated and charged to the patron accounts ("Calculate and charge"); -calculated and emailed to the admin but not applied ("Calculate (but only for mailing to the admin)"); or not calculated ("Don't calculate"). +or not calculated ("Don't calculate"). This script has the following parameters : -h --help: this message diff --git a/misc/cronjobs/staticfines.pl b/misc/cronjobs/staticfines.pl index 774c3b0e56..53ed1ada72 100755 --- a/misc/cronjobs/staticfines.pl +++ b/misc/cronjobs/staticfines.pl @@ -76,7 +76,6 @@ my $usage = << 'ENDUSAGE'; This script calculates and charges overdue fines to patron accounts. If the Koha System Preference 'finesMode' is set to 'production', the fines are charged to the patron accounts. -If set to 'test', the fines are calculated but not applied. Please note that the fines won't be applied on a holiday. -- 2.39.5