https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28663
David Nind <da...@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |da...@davidnind.com --- Comment #2 from David Nind <da...@davidnind.com> --- Created attachment 127519 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=127519&action=edit Bug 28663 - Screenshot - For me (see screenshot) there is no apply discount button for the void transaction. Also, the patch doesn't apply 8-(.. Applying: Bug 28663: Prevent discounts against void lines Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 28663: Prevent discounts against void lines -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/