[Koha-bugs] [Bug 4812] Reserves for a specific copy of a book say book is available even though it it still checked out to someone else

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4812

Maryse Simard <maryse.simard at inlibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |maryse.simard at inlibro.com

--- Comment #13 from Maryse Simard <maryse.simard at inlibro.com> ---
Patch doesn't apply. It seems to be due to the fact that the
ReservesNeedReturns logic was moved from placerequest.pl & opac-reserve.pl to
Reserves.pm by bug 20724.

Applying: Bug 4812: Reserves for a specific copy of a book say book is
available even though it it still checked out
.git/rebase-apply/patch:32: trailing whitespace.
                    $rank  = '0'; 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M       opac/opac-reserve.pl
M       reserve/placerequest.pl
.git/rebase-apply/patch:32: trailing whitespace.
                    $rank  = '0'; 
warning: 1 line applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging reserve/placerequest.pl
CONFLICT (content): Merge conflict in reserve/placerequest.pl
Auto-merging opac/opac-reserve.pl
CONFLICT (content): Merge conflict in opac/opac-reserve.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 4812: Reserves for a specific copy of a book say book
is available even though it it still checked out

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.