http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5669 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|5609 | -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5669 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED AssignedTo|kyle.m.hall@gmail.com |chris@bigballofwax.co.nz --- Comment #1 from Chris Cormack <chris@bigballofwax.co.nz> 2011-02-01 03:40:54 UTC --- Created attachment 3044 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=3044 Proposed Patch -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5669 David Schuster <dschust1@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dschust1@gmail.com --- Comment #2 from David Schuster <dschust1@gmail.com> 2011-02-01 04:19:02 UTC --- 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.

-- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5669 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nengard@gmail.com Patch Status|Needs Signoff |Does not apply --- Comment #4 from MJ Ray (software.coop) <mjr@ttllp.co.uk> 2011-03-02 18:47:52 UTC --- 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.... 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.... --- Comment #5 from Nicole C. Engard <nengard@gmail.com> 2011-03-04 15:09:23 UTC --- 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$ -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5669 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Signed Off |Patch Pushed --- Comment #7 from Chris Cormack <chris@bigballofwax.co.nz> 2011-03-14 03:58:12 UTC --- Pushed and merged please test and mark resolved -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.