[Koha-bugs] [Bug 31391] Staff-side recalls

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #40 from David Nind <david at davidnind.com> ---
Bug 31415 Depends on bug 31391 (Signed Off)
Follow? [(y)es, (n)o] y

The patch no longer applies (discovered when testing bug 31415):


Bug 31391 - Staff-side recalls

150485 - Bug 31391: RecallsInterface system preference
150486 - Bug 31391: Recalled authorised value for hold cancellation
150487 - Bug 31391: Implement RecallsInterface on OPAC
150488 - Bug 31391: Request recalls and convert reserves on staff interface
150489 - Bug 31391: (follow-up) Fix cancel recalls using checkbox
150490 - Bug 31391: (follow-up) Fix number of tests and terminology
150491 - Bug 31391: Interface and wording fixes

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 31391: RecallsInterface system preference
Applying: Bug 31391: Recalled authorised value for hold cancellation
Applying: Bug 31391: Implement RecallsInterface on OPAC
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 31391: Implement RecallsInterface on OPAC

-- 
You are receiving this mail because:
You are watching all bug changes.