https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29658 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |david@davidnind.com --- Comment #6 from David Nind <david@davidnind.com> --- I was able to reproduce using the tip from Joonas is comment #5 - in koha-testing-docker I added an order to the basket for record 5 (Perl best practices) as it has no items. However, the patch no longer applies 8-(.. git bz apply 29658 Bug 29658 - Crash on cancelling cancelled order 128364 - Bug 29658: Fix crash on cancelling cancelled order Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 29658: Fix crash on cancelling cancelled order Using index info to reconstruct a base tree... M acqui/cancelorder.pl M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt Auto-merging acqui/cancelorder.pl CONFLICT (content): Merge conflict in acqui/cancelorder.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 29658: Fix crash on cancelling cancelled order -- You are receiving this mail because: You are watching all bug changes.