@@ -, +, @@ --- .../bug_14048_refundlostitemfeeonreturn.perl | 31 ++++++++++++++++++++++ installer/data/mysql/sysprefs.sql | 2 +- .../en/modules/admin/preferences/circulation.pref | 10 ++++--- 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_14048_refundlostitemfeeonreturn.perl --- a/installer/data/mysql/atomicupdate/bug_14048_refundlostitemfeeonreturn.perl +++ a/installer/data/mysql/atomicupdate/bug_14048_refundlostitemfeeonreturn.perl @@ -0,0 +1,31 @@ +$DBversion = "16.06.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + CREATE TABLE `refund_lost_item_fee_rules` ( + `branchcode` varchar(10) NOT NULL default '', + `refund` tinyint(1) NOT NULL default 0, + PRIMARY KEY (`branchcode`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + }); + $dbh->do(q{ + INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) + VALUES( 'RefundLostOnReturnControl', + 'CheckinLibrary', + 'If a lost item is returned, choose which branch to pick rules for refunding.', + 'CheckinLibrary|PatronLibrary|ItemHomeBranch|ItemHoldingbranch', + 'Choice') + }); + # Pick the old syspref as the default rule + $dbh->do(q{ + INSERT INTO refund_lost_item_fee_rules (branchcode,refund) + SELECT '*', value FROM systempreferences WHERE variable='RefundLostItemFeeOnReturn' + }); + # Delete the old syspref + $dbh->do(q{ + DELETE IGNORE FROM systempreferences + WHERE variable='RefundLostItemFeeOnReturn' + }); + + print "Upgrade to $DBversion done (Bug 14048: Change RefundLostItemFeeOnReturn to be branch specific)\n"; + SetVersion($DBversion); +} --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -398,7 +398,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('QuoteOfTheDay','0',NULL,'Enable or disable display of Quote of the Day on the OPAC home page','YesNo'), ('RandomizeHoldsQueueWeight','0',NULL,'if ON, the holds queue in circulation will be randomized, either based on all location codes, or by the location codes specified in StaticHoldsQueueWeight','YesNo'), ('RecordLocalUseOnReturn','0',NULL,'If ON, statistically record returns of unissued items as local use, instead of return','YesNo'), -('RefundLostItemFeeOnReturn','1',NULL,'If enabled, the lost item fee charged to a borrower will be refunded when the lost item is returned.','YesNo'), +('RefundLostOnReturnControl','CheckinLibrary','CheckinLibrary|PatronLibrary|ItemHomeBranch|ItemHoldingbranch','If a lost item is returned, choose which branch to pick rules for refunding.','Choice'), ('RenewalPeriodBase','date_due','date_due|now','Set whether the renewal date should be counted from the date_due or from the moment the Patron asks for renewal ','Choice'), ('RenewalSendNotice','0','',NULL,'YesNo'), ('RenewSerialAddsSuggestion','0',NULL,'If ON, adds a new suggestion at serial subscription renewal','YesNo'), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -654,11 +654,13 @@ Circulation: - fines (when misc/cronjobs/fines.pl is being run). -
Note: Fines can also be charged by the CalculateFinesOnReturn system preference. - - - pref: RefundLostItemFeeOnReturn + - If a lost item is returned, apply the refunding rules defined in the + - pref: RefundLostOnReturnControl choices: - yes: Refund - no: "Don't refund" - - lost item fees charged to a borrower when the lost item is returned. + CheckinLibrary: "check-in library." + PatronLibrary: "patron library." + ItemHomeBranch: "item home branch." + ItemHoldingbranch: "item holding branch." - - pref: FinesIncludeGracePeriod choices: --