[Koha-bugs] [Bug 15261] Verify if checkout or hold request periods overlap with existing holds

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #88 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Hi Alex,

can you please rebase and test this patch really carefully? I looked at the
code a while ago and had a feeling that some things probably weren't quite
right due to previous rebasing. 

98672 - Bug 15261: Check if checkout/reserve request overlaps existing reserves

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 15261: Check if checkout/reserve request overlaps existing
reserves
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
M       C4/Reserves.pm
M       Koha/DateUtils.pm
M       circ/circulation.pl
M       installer/data/mysql/sysprefs.sql
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
M       opac/opac-reserve.pl
M       reserve/placerequest.pl
M       svc/renew
M       t/db_dependent/Circulation.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Circulation.t
Auto-merging svc/renew
Auto-merging reserve/placerequest.pl
Auto-merging opac/opac-reserve.pl
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
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging circ/circulation.pl
Auto-merging Koha/DateUtils.pm
Auto-merging C4/Reserves.pm
Auto-merging C4/Circulation.pm
CONFLICT (content): Merge conflict in C4/Circulation.pm

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