From 8adda23c87b7adea23f35682a258aaccfd90bc12 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 28 Jan 2014 11:43:50 -0500 Subject: [PATCH] [PASSED QA] Bug 11629 - Add ability to update not for loan status on checkin Some libraries would like to streamline the cataloging process my automatically updating notforloan values on checkin. For example, an item is set to notforloan of -1 ( ordered ). The item, is received, processed, and checked in for the first time before being shelved. The checkin automatically changes the nfl value from -1 to 0. The same workflow could be used for damaged items as well. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Set the new system preference UpdateNotForLoanStatusOnCheckin to the following: -1: 0 0: 1 4) Create an item, set it's notforloan value to -1 5) Check in the item, note its not for loan value is now 0 6) Check in the item again, note its not for loan value is now 1 7) Check in the item again, note its not for loan value reamins 1 Signed-off-by: Havilah Lyon Signed-off-by: Katrin Fischer Testing notes on last patch. --- C4/Circulation.pm | 19 +++++++++++++++++++ installer/data/mysql/sysprefs.sql | 2 ++ installer/data/mysql/updatedatabase.pl | 7 +++++++ .../en/modules/admin/preferences/circulation.pref | 7 +++++++ 4 files changed, 35 insertions(+) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index f4fe578..e00d65b 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1727,6 +1727,25 @@ sub AddReturn { my $borrowernumber = $borrower->{'borrowernumber'} || undef; # we don't know if we had a borrower or not + my $yaml = C4::Context->preference('UpdateNotForLoanStatusOnCheckin'); + if ($yaml) { + $yaml = "$yaml\n\n"; # YAML is anal on ending \n. Surplus does not hurt + my $rules; + eval { $rules = YAML::Load($yaml); }; + if ($@) { + warn "Unable to parse UpdateNotForLoanStatusOnCheckin syspref : $@"; + } + else { + foreach my $key ( keys %$rules ) { + if ( $item->{notforloan} eq $key ) { + ModItem( { notforloan => $rules->{$key} }, undef, $itemnumber ); + last; + } + } + } + } + + # check if the book is in a permanent collection.... # FIXME -- This 'PE' attribute is largely undocumented. afaict, there's no user interface that reflects this functionality. if ( $hbr ) { diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 9bacfde..e8937c9 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -397,7 +397,9 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('TrackClicks','0',NULL,'Track links clicked','Integer'), ('TransfersMaxDaysWarning','3',NULL,'Define the days before a transfer is suspected of having a problem','Integer'), ('TransferWhenCancelAllWaitingHolds','0',NULL,'Transfer items when cancelling all waiting holds','YesNo'), +('UpdateNotForLoanStatusOnCheckin', '', 'NULL', 'This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value it will be updated to the right-hand value. E.g. ''-1: 0'' will cause an item that was set to ''Ordered'' to now be available for loan. Each pair of values should be on a separate line.', 'Free'), ('UNIMARCAuthorityField100','afrey50 ba0',NULL,'Define the contents of UNIMARC authority control field 100 position 08-35','Textarea'), +('UNIMARCAuthorityField100','afrey50 ba0',NULL,NULL,'Textarea'), ('UNIMARCAuthorsFacetsSeparator',', ',NULL,'UNIMARC authors facets separator','short'), ('UNIMARCField100Language','fre',NULL,'UNIMARC field 100 default language','short'), ('UniqueItemFields','barcode','','Space-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table','Free'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 4de4f4e..abee946 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8129,6 +8129,13 @@ if(CheckVersion($DBversion)) { SetVersion($DBversion); } +$DBversion = "3.15.00.XXX"; +if (CheckVersion($DBversion)) { + $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('UpdateNotForLoanStatusOnCheckin', '', 'NULL', 'This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value it will be updated to the right-hand value. E.g. ''-1: 0'' will cause an item that was set to ''Ordered'' to now be available for loan. Each pair of values should be on a separate line.', 'Free');"); + print "Upgrade to $DBversion done (Bug 11629 - Add ability to update not for loan status on checkin)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) 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 7d44f79..a49ba21 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 @@ -351,6 +351,13 @@ Circulation: no: "Don't" - calculate and update overdue charges when an item is returned. -
NOTE If you are doing hourly loans then you should have this on. + - + - pref: UpdateNotForLoanStatusOnCheckin + type: textarea + class: code + - This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value + - "it will be updated to the right-hand value. E.g. '-1: 0' will cause an item that was set to 'Ordered' to now be available for loan." + - Each pair of values should be on a separate line. Holds Policy: - - pref: AllowHoldPolicyOverride -- 1.8.3.2