[Koha-bugs] [Bug 32142] Add HoldFeeMode option "if all items are checked out OR the record has at least one hold already"

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

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

Philip Orr <philip.orr at lmscloud.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Failed QA
                 CC|                            |philip.orr at lmscloud.de

--- Comment #12 from Philip Orr <philip.orr at lmscloud.de> ---
Hi Aleisha, would love to sign off on this one!
Unfortunately when applying the patch (on ktd) I get the following error:
'''
Applying: Bug 32142: Add issued_or_reserved option to HoldFeeMode syspref
Using index info to reconstruct a base tree...
M       installer/data/mysql/mandatory/sysprefs.sql
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/mandatory/sysprefs.sql
error: Failed to merge in the changes.
Patch failed at 0001 Bug 32142: Add issued_or_reserved option to HoldFeeMode
syspref
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".
'''

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