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

Bug 7614: (QA follow-up) Fix POD merge missed in rebase

Browse source 
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Kyle Hall 2019-01-22 13:49:13 -05:00 committed by Nick Clemens
parent 2cd3a71871
commit 2c2d0cd699
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
C4/Reserves.pm
View file

@ -297,7 +297,6 @@ sub CanBookBeReserved{
$canReserve = &CanItemBeReserved($borrowernumber, $itemnumber, $branchcode)
if ($canReserve->{status} eq 'OK') { #We can reserve this Item! }
<<<<<<< HEAD
@RETURNS { status => OK }, if the Item can be reserved.
{ status => ageRestricted }, if the Item is age restricted for this borrower.
{ status => damaged }, if the Item is damaged.
@ -306,17 +305,7 @@ sub CanBookBeReserved{
{ status => notReservable }, if holds on this item are not allowed
{ status => libraryNotFound }, if given branchcode is not an existing library
{ status => libraryNotPickupLocation }, if given branchcode is not configured to be a pickup location
=======
@RETURNS OK, if the Item can be reserved.
ageRestricted, if the Item is age restricted for this borrower.
damaged, if the Item is damaged.
cannotReserveFromOtherBranches, if syspref 'canreservefromotherbranches' is OK.
tooManyReserves, if the borrower has exceeded his maximum reserve amount.
notReservable, if holds on this item are not allowed
libraryNotFound if given branchcode is not an existing library
libraryNotPickupLocation if given branchcode is not configured to be a pickup location
cannotBeTransferred if branch transfer limit applies on given item and branchcode
>>>>>>> Bug 7614: Check transfer limit in CanBookBeReserved and CanItemBeReserved
{ status => cannotBeTransferred }, if branch transfer limit applies on given item and branchcode
=cut