[Koha-bugs] [Bug 27595] Place holds for patrons on accepted purchase suggestions

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Passed QA                   |Patch doesn't apply

--- Comment #31 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch no longer applies and I'd prefer a rebase by the author. With the new
list on the dashboard this should come right back up in the queue.

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 27595: Add new system preference
PlaceHoldsOnOrdersFromSuggestions
Using index info to reconstruct a base tree...
M       installer/data/mysql/mandatory/sysprefs.sql
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
Applying: Bug 27595: Add place_hold method to Koha::Suggestion
Applying: Bug 27595: Place holds when ordering from a suggestion
Using index info to reconstruct a base tree...
M       acqui/addorder.pl
Falling back to patching base and 3-way merge...
Auto-merging acqui/addorder.pl
CONFLICT (content): Merge conflict in acqui/addorder.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 27595: Place holds when ordering from a suggestion
hint: Use 'git am --show-current-patch=diff' to see the failed 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-27595-Place-holds-when-ordering-from-a-suggest-4__rodz_.patch

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