https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25763
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #2 from Séverine Queune <[email protected]> --- Hi Nick ! Sorry about that, i'd be happy to test it if you can fix that one ! 105892 - Bug 25763: Allow updating of order fund from invoice Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 25763: Allow updating of order fund from invoice Using index info to reconstruct a base tree... M acqui/invoice.pl M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt Auto-merging acqui/invoice.pl Failed to merge in the changes. Patch failed at 0001 Bug 25763: Allow updating of order fund from invoice -- 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/
