From 1fa7920f2a97574d455944e632e16e43503e239e Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 20 May 2020 09:30:45 -0400 Subject: [PATCH] Bug 25552: Add missing Claims Returned option to MarkLostItemsAsReturned Marking an item as a return claim checks MarkLostItemsAsReturned to see if claim_returned is a value in MarkLostItemsAsReturned. However, this option was never added to MarkLostItemsAsReturned so an a return claim can never be automatically removed from the patron record, even if they wanted such behavior. Test Plan: 1) Apply this patch 2) Restart all the things 3) Note the new return claims option on MarkLostItemsAsReturned in the system preferences Signed-off-by: Marti Fyerst Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit e53d559f4212fa4b25412fdd6325ae469328f26a) Signed-off-by: Fridolin Somers --- installer/data/mysql/atomicupdate/bug_25552.perl | 8 ++++++++ installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/circulation.pref | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 installer/data/mysql/atomicupdate/bug_25552.perl diff --git a/installer/data/mysql/atomicupdate/bug_25552.perl b/installer/data/mysql/atomicupdate/bug_25552.perl new file mode 100644 index 0000000000..ad76e6ba08 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_25552.perl @@ -0,0 +1,8 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + UPDATE systempreferences SET options = "claim_returned|batchmod|moredetail|cronjob|additem|pendingreserves|onpayment" WHERE variable = "MarkLostItemsAsReturned"; + }); + # Always end with this (adjust the bug info) + NewVersion( $DBversion, 25552, "Add missing Claims Returned option to MarkLostItemsAsReturned"); +} diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 7f0afaa594..1c15181427 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -319,7 +319,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('MarcFieldForModifierName','',NULL,'Where to store the name of the record''s last modifier','Free'), ('MarcFieldsToOrder','',NULL,'Set the mapping values for a new order line created from a MARC record in a staged file. In a YAML format.','textarea'), ('MarcItemFieldsToOrder','',NULL,'Set the mapping values for new item records created from a MARC record in a staged file. In a YAML format.','textarea'), -('MarkLostItemsAsReturned','batchmod,moredetail,cronjob,additem,pendingreserves,onpayment','batchmod|moredetail|cronjob|additem|pendingreserves|onpayment','Mark items as returned when flagged as lost','multiple'), +('MarkLostItemsAsReturned','batchmod,moredetail,cronjob,additem,pendingreserves,onpayment','claim_returned|batchmod|moredetail|cronjob|additem|pendingreserves|onpayment','Mark items as returned when flagged as lost','multiple'), ('MARCOrgCode','OSt','','Define MARC Organization Code for MARC21 records - http://www.loc.gov/marc/organizations/orgshome.html','free'), ('MaxFine',NULL,'','Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','Integer'), ('MaxItemsToDisplayForBatchDel','1000',NULL,'Display up to a given number of items in a single item deletionbatch.','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 9bd26d5aa1..4ccbf28af8 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 @@ -468,6 +468,7 @@ Circulation: moredetail: "from the items tab of the catalog module" pendingreserves: "from the 'Holds to pull' list" onpayment: "when receiving payment for the item" + claim_returned: "when marking an item as a return claim" - . - - pref: AllowMultipleIssuesOnABiblio -- 2.39.5