https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27893 --- Comment #16 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to David Nind from comment #13)
The patch no longer applies (also has whitespace errors):
Bug 27893 Depends on bug 36068 (Needs Signoff) Follow? [(y)es, (n)o] y
Bug 36068 - Add maintenance script acq_cancel_obsolete_orders.pl
162261 - Bug 36068: Add maint script acq_cancel_obsolete_orders.pl 162262 - Bug 36068: Do not overwrite cancellation date in ->cancel
Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36068: Add maint script acq_cancel_obsolete_orders.pl Applying: Bug 36068: Do not overwrite cancellation date in ->cancel
Bug 27893 - Delete of biblio should warn about attached acq orders and cancel them
162271 - Bug 27893: Cancel acq orders in addbiblio.pl 162272 - Bug 27893: Optionally skip biblio with open orders in batch delete
Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 27893: Cancel acq orders in addbiblio.pl .git/rebase-apply/patch:59: trailing whitespace.
warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M cataloguing/addbiblio.pl .git/rebase-apply/patch:59: trailing whitespace.
warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging cataloguing/addbiblio.pl CONFLICT (content): Merge conflict in cataloguing/addbiblio.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 27893: Cancel acq orders in addbiblio.pl
Thx for testing. Rebased now for CSRF changes. -- You are receiving this mail because: You are watching all bug changes.