[Koha-bugs] [Bug 19532] Recalls for Koha

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #744 from David Nind <david at davidnind.com> ---
Hi Aleisha.

I started around Friday, but didn't get very far...

>From what I can recall (pun intended!), these tests failed:

prove t/db_dependent/Koha/Recall.t
prove t/db_dependent/Koha/Recalls.t

Today (Monday), the patch no longer applies:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19532: Database and installer stuff
Applying: Bug 19532: Updated schema files
Applying: Bug 19532: Add boolean flags to recalls.old and
recalls.item_level_recall
Applying: Bug 19532: Recalls objects and tests
Applying: Bug 19532: Expiry and overdue cronjobs, and overdue fine calculation
Applying: Bug 19532: Other objects used in recalls feature
Applying: Bug 19532: Recalls on OPAC
Applying: Bug 19532: Recalls on intranet
Using index info to reconstruct a base tree...
M       circ/circulation.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Falling back to patching base and 3-way merge...
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 circ/circulation.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 19532: Recalls on intranet

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