[Koha-bugs] [Bug 23051] Optionally renew fine accruing items when all fines on item are paid off

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

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

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |alexbuckley at catalyst.net.nz

--- Comment #8 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Hi there,

I am sorry this patch does not apply cleanly. 

vagrant at kohadevbox:kohaclone((b558895...))$ git bz apply 23051
Bug 23051 - Optionally renew fine accruing items when all fines on item are
paid off

91058 - Bug 23051: Add RenewAccruingItemWhenPaid syspref
91059 - Bug 23051: Renew items when fines paid off
91060 - Bug 23051: Add unit tests

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 23051: Add RenewAccruingItemWhenPaid syspref
Applying: Bug 23051: Renew items when fines paid off
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
M       Koha/Account.pm
M       Koha/Account/Line.pm
Falling back to patching base and 3-way merge...
Auto-merging Koha/Account/Line.pm
Auto-merging Koha/Account.pm
CONFLICT (content): Merge conflict in Koha/Account.pm
Auto-merging C4/Circulation.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 23051: Renew items when fines paid off
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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-23051-Renew-items-when-fines-paid-off-YTUZjH.patch

Can you please rebase it and re-attach it to this bug report, thanks for your
contribution :)

Cheers,
Alex

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