Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 21633: Remove finesMode 'test'

Browse source 
Signed-off-by: Magnus Enger <magnus@libriotech.no>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Nick Clemens 2020-01-03 14:56:53 +00:00 committed by Martin Renvoize
parent 2cf4496dd6
commit aa83cb59ce
Signed by: martin.renvoize
GPG key ID: 422B469130441A0F
5 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl Normal file
View file

@ -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";
}

2
installer/data/mysql/sysprefs.sql
View file

@ -195,7 +195,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'),

1
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
View file

@ -861,7 +861,6 @@ Circulation:
type: choice
choices:
off: "Don't calculate"
test: Calculate (but only for mailing to the admin)
production: Calculate and charge
- fines (when <code>misc/cronjobs/fines.pl</code> is being run).
- "<br><strong>NOTE:</strong> Fines can also be charged by the CalculateFinesOnReturn system preference."

2
misc/cronjobs/fines.pl
View file

@ -59,7 +59,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

1
misc/cronjobs/staticfines.pl
View file

@ -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.