[Koha-bugs] [Bug 8236] Prevent renewing if overdue or restriction

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8236

Campbell Reid-Tait <campbellreidtait at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |campbellreidtait at gmail.com

--- Comment #51 from Campbell Reid-Tait <campbellreidtait at gmail.com> ---
Patch does not apply.

Bug 8236 Block renewing for overdue items (25.44 KB, patch)
2013-06-07 10:19 UTC, Koha Team Lyon 3 

Applying: Bug 8236 Block renewing for overdue items
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging reserve/renewscript.pl
Auto-merging opac/opac-user.pl
Auto-merging members/moremember.pl
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-user.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/modules/admin/preferences/circulation.pref
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merging circ/circulation.pl
Auto-merging C4/ILSDI/Services.pm
Auto-merging C4/Circulation.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 8236 Block renewing for overdue items

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