From 1f4233ed72fe10cf2c1eab86689443607fa30b77 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 10 Jul 2019 14:34:47 +0100 Subject: [PATCH] Bug 23293: Add system preference --- installer/data/mysql/atomicupdate/bug_23293.perl | 11 +++++++++++ installer/data/mysql/sysprefs.sql | 3 ++- .../prog/en/modules/admin/preferences/opac.pref | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 installer/data/mysql/atomicupdate/bug_23293.perl diff --git a/installer/data/mysql/atomicupdate/bug_23293.perl b/installer/data/mysql/atomicupdate/bug_23293.perl new file mode 100644 index 0000000000..092985087e --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_23293.perl @@ -0,0 +1,11 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do( q{ + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES + ('OPACFineNoRenewalsIncludeCredits','1',NULL,'If enabled the value specified in OPACFineNoRenewals should include any unapplied account credits in the calculation','YesNo') + }); + + # Always end with this (adjust the bug info) + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 23293 - Add 'OPACFineNoRenewalsIncludeCredits' system preference)\n"; +} diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index a0d1132d25..b7b9656843 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -663,5 +663,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('XSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on intranet','Free'), ('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'), ('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'), -('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo') +('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'), +('OPACFineNoRenewalsIncludeCredits','1',NULL,'If enabled the value specified in OPACFineNoRenewals should include any unapplied account credits in the calculation','YesNo') ; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 567e62276d..e6cb57e595 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -602,6 +602,12 @@ OPAC: - pref: OPACFineNoRenewals class: currency - '[% local_currency %] in fines (leave blank to disable).' + - + - pref: OPACFineNoRenewalsIncludeCredits + choices: + yes: Include + no: "Don't include" + - outstanding/unapplied credits when applying the OPACFineNoRenewals rule to users - - pref: OPACViewOthersSuggestions choices: -- 2.20.1