http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7288
Paola Rossi <paola.ro...@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #10 from Paola Rossi <paola.ro...@cineca.it> --- Rebasing invoices.tt is neeeded. Against master 3.13.00.032: Applying: Bug 7288: Allow to display only subscriptions in the invoices table Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt Auto-merging C4/Acquisition.pm Failed to merge in the changes. Patch failed at 0001 Bug 7288: Allow to display only subscriptions in the invoices table So I pass the patch to failed QA status. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/