https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36789
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #9 from David Nind <[email protected]> --- Something in one of the dependencies cases bug 36915 to not apply (although 36915 applies OK by itself). Will re-test once dependencies fixed. git bz apply 36789 Bug 36789 Depends on bug 36271 (Needs Signoff) Follow? [(y)es, (n)o] y Bug 36271 Depends on bug 35906 (Signed Off) Follow? [(y)es, (n)o] y Bug 35906 - Add bookable option on itemtypes 166866 - Bug 35906: Add bookable option on itemtype 166867 - Bug 35906: Add unit test 166868 - Bug 35906: Remove preference and add override handling 166869 - Bug 35906: Schema dump 166870 - Bug 35906: (QA follow-up) Fix item-type schema 166871 - Bug 35906: (follow-up) rebased it Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35906: Add bookable option on itemtype Applying: Bug 35906: Add unit test Applying: Bug 35906: Remove preference and add override handling Applying: Bug 35906: Schema dump Applying: Bug 35906: (QA follow-up) Fix item-type schema Applying: Bug 35906: (follow-up) rebased it Bug 36271 - Bookings should respect circulation rules for max loan periods 166962 - Bug 36271: Add circulation rules for booking Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36271: Add circulation rules for booking Bug 36789 Depends on bug 36915 (Failed QA) Follow? [(y)es, (n)o] y Bug 36915 - Send email notification when a booking is cancelled 167013 - Bug 36915: Send email notification when a booking is cancelled Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36915: Send email notification when a booking is cancelled Using index info to reconstruct a base tree... M Koha/Booking.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Booking.pm CONFLICT (content): Merge conflict in Koha/Booking.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 36915: Send email notification when a booking is cancelled -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
