Attachment 84309 Details for Bug 7614 – Bug 7614 [QA Follow-up]: Fix POD merge missed in rebase

[patch] Bug 7614 [QA Follow-up]: Fix POD merge missed in rebase

Bug-7614-QA-Follow-up-Fix-POD-merge-missed-in-reba.patch (text/plain), 2.07 KB, created by Kyle M Hall (khall) on 2019-01-22 19:08:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2019-01-22 19:08:03 UTC

Size: 2.07 KB

patch

obsolete

>From d563397cb9f444c0ab0fb1261661933c6e31ccec Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>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)

Actions: View | Diff | Splinter Review

Attachments on bug 7614: 60141 | 60142 | 60143 | 60144 | 60145 | 60785 | 60786 | 60787 | 60938 | 60946 | 70047 | 77895 | 77896 | 77897 | 77898 | 77899 | 77900 | 78020 | 84295 | 84296 | 84297 | 84298 | 84299 | 84300 | 84301 | 84302 | 84303 | 84304 | 84305 | 84306 | 84307 | 84308 | 84309 | 84310 | 84311