From 13bbe493af4e64f96694f0226c3a49e3631a41f6 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 21 Feb 2017 12:26:25 +0000 Subject: [PATCH] Bug 16735: Remove use of get_categories Feature using it is completely undocumented as far as my research has shown. Signed-off-by: Tomas Cohen Arazi --- C4/Circulation.pm | 29 ----------------------------- C4/SIP/ILS/Transaction/Checkin.pm | 2 +- circ/branchtransfers.pl | 4 ---- circ/returns.pl | 7 ------- 4 files changed, 1 insertion(+), 41 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 9397cbc1b5..4129f6a371 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -278,10 +278,6 @@ is a reference-to-hash which may have any of the following keys: There is no item in the catalog with the given barcode. The value is C<$barcode>. -=item C - -The item's home branch is permanent. This doesn't prevent the item from being transferred, though. The value is the code of the item's home branch. - =item C The item is already at the branch to which it is being transferred. The transfer is nonetheless considered to have failed. The value should be ignored. @@ -336,15 +332,6 @@ sub transferbook { } } - # if is permanent... - # FIXME Is this still used by someone? - # See other FIXME in AddReturn - my $library = Koha::Libraries->find($hbr); - if ( $library and $library->get_categories->search({'me.categorycode' => 'PE'})->count ) { - $messages->{'IsPermanent'} = $hbr; - $dotransfer = 0; - } - # can't transfer book if is already there.... if ( $fbr eq $tbr ) { $messages->{'DestinationEqualsHolding'} = 1; @@ -1766,12 +1753,6 @@ No item with this barcode exists. The value is C<$barcode>. The book is not currently on loan. The value is C<$barcode>. -=item C - -The book's home branch is a permanent collection. If you have borrowed -this book, you are not allowed to return it. The value is the code for -the book's home branch. - =item C This book has been withdrawn/cancelled. The value should be ignored. @@ -1886,16 +1867,6 @@ sub AddReturn { } } - - # 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 ( $returnbranch ) { - my $library = Koha::Libraries->find($returnbranch); - if ( $library and $library->get_categories->search({'me.categorycode' => 'PE'})->count ) { - $messages->{'IsPermanent'} = $returnbranch; - } - } - # check if the return is allowed at this branch my ($returnallowed, $message) = CanBookBeReturned($item, $branch); unless ($returnallowed){ diff --git a/C4/SIP/ILS/Transaction/Checkin.pm b/C4/SIP/ILS/Transaction/Checkin.pm index 1e138bcf6e..2ad3df5394 100644 --- a/C4/SIP/ILS/Transaction/Checkin.pm +++ b/C4/SIP/ILS/Transaction/Checkin.pm @@ -67,7 +67,7 @@ sub do_checkin { $debug and warn "do_checkin() calling AddReturn($barcode, $branch)"; my ($return, $messages, $iteminformation, $borrower) = AddReturn($barcode, $branch, undef, undef, $return_date); $self->alert(!$return); - # ignoring messages: NotIssued, IsPermanent, WasLost, WasTransfered + # ignoring messages: NotIssued, WasLost, WasTransfered # biblionumber, biblioitemnumber, itemnumber # borrowernumber, reservedate, branchcode diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl index c1d30cb55d..66fb59bcc6 100755 --- a/circ/branchtransfers.pl +++ b/circ/branchtransfers.pl @@ -206,10 +206,6 @@ foreach my $code ( keys %$messages ) { $err{tbr} = $tbr; $err{code} = $typecode; } - elsif ( $code eq 'IsPermanent' ) { - $err{errispermanent} = 1; - $err{msg} = $messages->{'IsPermanent'}; - } elsif ( $code eq 'WasReturned' ) { $err{errwasreturned} = 1; $err{borrowernumber} = $messages->{'WasReturned'}; diff --git a/circ/returns.pl b/circ/returns.pl index e2c815b1e3..a1089391e2 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -498,7 +498,6 @@ foreach my $code ( keys %$messages ) { elsif ( $code eq 'NotIssued' ) { $err{notissued} = 1; $err{msg} = ''; - $err{msg} = $messages->{'IsPermanent'} if $messages->{'IsPermanent'}; } elsif ( $code eq 'LocalUse' ) { $err{localuse} = 1; @@ -523,12 +522,6 @@ foreach my $code ( keys %$messages ) { $err{withdrawn} = 1; $exit_required_p = 1 if C4::Context->preference("BlockReturnOfWithdrawnItems"); } - elsif ( ( $code eq 'IsPermanent' ) && ( not $messages->{'ResFound'} ) ) { - if ( $messages->{'IsPermanent'} ne $userenv_branch ) { - $err{ispermanent} = 1; - $err{msg} = $messages->{'IsPermanent'}; - } - } elsif ( $code eq 'WrongTransfer' ) { ; # FIXME... anything to do here? } -- 2.14.1