https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36271
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #17 from David Nind <[email protected]> --- The patches no longer apply 8-(.. git bz apply 36271 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 166809 - Bug 36271: Add circulation rules for booking 166907 - Bug 36271: (follow-up) Add switch for join table according to item-level_itypes syspref Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36271: Add circulation rules for booking Using index info to reconstruct a base tree... M Koha/Booking.pm M Koha/REST/V1/Bookings.pm M admin/smart-rules.pl M koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt A koha-tmpl/intranet-tmpl/prog/js/place_booking_modal.js Falling back to patching base and 3-way merge... CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/js/place_booking_modal.js deleted in HEAD and modified in Bug 36271: Add circulation rules for booking. Version Bug 36271: Add circulation rules for booking of koha-tmpl/intranet-tmpl/prog/js/place_booking_modal.js left in tree. Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Auto-merging admin/smart-rules.pl Auto-merging Koha/REST/V1/Bookings.pm Auto-merging Koha/Booking.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 36271: Add circulation rules for booking -- 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/
