http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11062 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |paola.rossi@cineca.it --- Comment #2 from Paola Rossi <paola.rossi@cineca.it> --- I've tried to apply the patch against master 3.17.00.013 Applying: Bug 11062 - Invoice's shipment/shipping cost should be included PRE-gst tax (as an option) Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Bookseller.t Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging acqui/supplier.pl Auto-merging acqui/parcels.pl Auto-merging acqui/invoice.pl CONFLICT (content): Merge conflict in acqui/invoice.pl Failed to merge in the changes. Patch failed at 0001 Bug 11062 - Invoice's shipment/shipping cost should be included PRE-gst tax (as an option) So I pass the patch to "Patch doesn't apply" status. -- You are receiving this mail because: You are watching all bug changes.