http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11062
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #4 from Paola Rossi <[email protected]> --- Today I've tried to apply the patch against master 3.17.00.016 There has been a conflict: 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 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Auto-merging acqui/updatesupplier.pl Auto-merging acqui/supplier.pl CONFLICT (content): Merge conflict in acqui/supplier.pl Auto-merging C4/Bookseller.pm CONFLICT (content): Merge conflict in C4/Bookseller.pm 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. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
