The system shall include a system preference to toggle whether to allow users to choose their hold pick up branch. If disabled, they can only pick up from their home library.
Created attachment 3044 [details] [review] Proposed Patch
Question so does this not show the other locations as well when placing the hold? I see this is step one in a multi hold process rewrite. (In reply to comment #0) > The system shall include a system preference to toggle whether to allow users > to choose their hold pick up branch. If disabled, they can only pick up from > their home library.
Thats right, with this on, the users home branch is set for pickup and they have no option to choose. You can place a hold on an item anywhere, but you can't choose where you want it to be be picked up, it just defaults to the homebranch
This bug is mentioned in: Bug 5669: Adding a system preference to control whether a user can select a pick branch for their hold or not http://lists.koha-community.org/pipermail/koha-patches/2011-February/013729.html Bug 5669: Adding a system preference to control whether a user can select a pick branch for their hold or not http://lists.koha-community.org/pipermail/koha-patches/2011-February/013732.html
Does not apply: Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 5669: Adding a system preference to control whether a user can select a pick branch for their hold or not Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/de-DE/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/de-DE/mandatory/sysprefs.sql Auto-merging installer/data/mysql/en/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/en/mandatory/sysprefs.sql Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql Auto-merging installer/data/mysql/it-IT/necessari/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/it-IT/necessari/sysprefs.sql Auto-merging installer/data/mysql/pl-PL/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/pl-PL/mandatory/sysprefs.sql Auto-merging installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql CONFLICT (content): Merge conflict in installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql Auto-merging installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql CONFLICT (content): Merge conflict in installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl Auto-merging kohaversion.pl CONFLICT (content): Merge conflict in kohaversion.pl Auto-merging opac/opac-reserve.pl Failed to merge in the changes. Patch failed at 0001 Bug 5669: Adding a system preference to control whether a user can select a pick branch for their hold or not When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". nengard@debian:~/kohaclone$
This has been signed off by Frederic
Pushed and merged please test and mark resolved