[Koha-bugs] [Bug 15516] Allow to place a hold on first available item from a group of titles

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

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

--- Comment #155 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Currently this patch set doesn't apply. Can you please rebase? It might make
sense to wait a bit until after the 19.05 release as this will be for 19.11.

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 15516: Allow to reserve first available item from a group of
titles
Using index info to reconstruct a base tree...
M       C4/Reserves.pm
M       installer/data/mysql/kohastructure.sql
M       koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
M       reserve/placerequest.pl
M       reserve/request.pl
Falling back to patching base and 3-way merge...
Auto-merging reserve/request.pl
Auto-merging reserve/placerequest.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging C4/Reserves.pm
Applying: Bug 15516: Holding first available item from x biblios only count 1
reserve
Applying: Bug 15516: Update old_reserves (reserve_group_id)
Applying: Bug 15516: Set reserve-group.pl to be executable
Applying: Bug 15516: Reword 'reserve group' to 'hold group'
Applying: Bug 15516: Fix translation issues
Applying: Bug 15516: (follow-up) Fix kohastructure.sql
Applying: Bug 15516: (follow-up) Fix reserve -> hold change
Applying: Bug 15516: (follow-up) Fix modal for hold group
error: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt).
error: could not build fake ancestor
Patch failed at 0001 Bug 15516: (follow-up) Fix modal for hold group
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Bug-15516-follow-up-Fix-modal-for-hold-group-vopUHO.patch

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