[Koha-bugs] [Bug 15774] Additional fields for baskets
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Mon Nov 12 20:56:06 CET 2018
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15774
--- Comment #78 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Some conflicts:
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
Auto-merging admin/additional-fields.pl
Auto-merging acqui/histsearch.pl
CONFLICT (content): Merge conflict in acqui/histsearch.pl
Auto-merging acqui/basket.pl
Auto-merging C4/Acquisition.pm
CONFLICT (content): Merge conflict in C4/Acquisition.pm
error: Failed to merge in the changes.
For permissions:
Until this patch everyone with any serials permission could add/update
additional fields: { serials => '*' },
It's a little hard to find a good pref for a feature that spans
multiple-modules now. I think a new admin permission might make the most sense.
Then update patrons with serials permissions to have that.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list