From d563397cb9f444c0ab0fb1261661933c6e31ccec Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 22 Jan 2019 13:49:13 -0500 Subject: [PATCH] Bug 7614 [QA Follow-up]: Fix POD merge missed in rebase --- C4/Reserves.pm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index bf3d515734..77880dc737 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -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 -- 2.17.2 (Apple Git-113)