Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 20724: Move the ReservesNeedReturns logic to AddReserve

Browse source 
Signed-off-by: Victor Grousset <victor.grousset@biblibre.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2018-05-10 11:40:11 -03:00
parent c585f11497
commit 1798d22e76
3 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
C4/Reserves.pm
View file

@ -171,6 +171,16 @@ sub AddReserve {
$expdate = output_pref({ str => $expdate, dateonly => 1, dateformat => 'iso' });
# if we have an item selectionned, and the pickup branch is the same as the holdingbranch
# of the document, we force the value $priority and $found .
if ( $checkitem and not C4::Context->preference('ReservesNeedReturns') ) {
$priority = 0;
my $item = Koha::Items->find( $checkitem ); # FIXME Prevent bad calls
if ( $item->holdingbranch eq $branch ) {
$found = 'W';
}
}
if ( C4::Context->preference('AllowHoldDateInFuture') ) {
# Make room in reserves for this before those of a later reserve date

6
opac/opac-reserve.pl
View file

@ -272,12 +272,6 @@ if ( $query->param('place_reserve') ) {
my $rank = $biblioData->{rank};
if ( $itemNum ne '' ) {
$canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum ) eq 'OK';
$rank = '0' unless C4::Context->preference('ReservesNeedReturns');
my $item = GetItem($itemNum);
if ( $item->{'holdingbranch'} eq $branch ) {
$found = 'W'
unless C4::Context->preference('ReservesNeedReturns');
}
}
else {
$canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum ) eq 'OK';

12
reserve/placerequest.pl
View file

@ -70,18 +70,6 @@ foreach my $bibnum (@biblionumbers) {
my $found;
# if we have an item selectionned, and the pickup branch is the same as the holdingbranch
# of the document, we force the value $rank and $found .
if (defined $checkitem && $checkitem ne ''){
$holds_to_place_count = 1;
$rank[0] = '0' unless C4::Context->preference('ReservesNeedReturns');
my $item = $checkitem;
$item = GetItem($item);
if ( $item->{'holdingbranch'} eq $branch ){
$found = 'W' unless C4::Context->preference('ReservesNeedReturns');
}
}
if ( $type eq 'str8' && $borrower ) {
foreach my $biblionumber ( keys %bibinfos ) {