https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13870
Stephanie Etallaz <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |Sandbox CC| |stephanie.etallaz@univ-cote | |dazur.fr Status|Needs Signoff |Patch doesn't apply --- Comment #14 from Stephanie Etallaz <[email protected]> --- (In reply to Thibaud Guillot (thibaud_g) from comment #12) > Created attachment 176858 [details] [review] > Bug 13870: Add warn about linked order or/and subscription on batch item > table > > When you try to manage/delete/edit items I added an info about linked > order or/and linked subscription. > > Test plan : > > 1) Apply this patch > 2) Restart_all > 3) Be sure to have item with order or can concern by a subscription > 4) On biblio record page click on Edit -> Manage items > 5) See the yellow triangle next to the 'delete' action in 'actions' > dropdown menu (with subscription id or ordernumber hover the symbol) > 6) When you edit or delete items (batch mode) you can see two new > columns about orders and subscriptions linked. > > Sponsored by: BibLibre Hi, When I try to apply the patch, I have this error's message : CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc error: Failed to merge in the changes. -- 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/
