[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

Pierre Angot <tredok.pierre at gmail.com> changed:

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

--- Comment #43 from Pierre Angot <tredok.pierre at gmail.com> ---
Sandbox setup by tredok.pierre at gmail.com with database 2 and bug 8236 on Thu
Jun 6 08:57:09 2013

Something went wrong !
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 C4/Circulation.pm
CONFLICT (content): Merge conflict in C4/Circulation.pm
Auto-merging circ/circulation.pl
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
Auto-merging members/moremember.pl
Auto-merging opac/opac-user.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 8236 Block renewing for overdue items
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Bug 8236 - Prevent renewing if overdue or restriction

Bug-8236-Block-renewing-for-overdue-items.patch
Apply? [yn]
Patch left in /tmp/Bug-8236-Block-renewing-for-overdue-itemspatch-qFvBtT.patch

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