[Koha-bugs] [Bug 7090] Add "AllowItemsOnHandCheckout" syspref to allow issue to the patron regardless of hold status

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7090

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |katrin.fischer at bsz-bw.de
       Patch Status|Needs Signoff               |Does not apply

--- Comment #2 from Katrin Fischer <katrin.fischer at bsz-bw.de> 2011-12-21 06:17:57 UTC ---
Patch doesn't apply on current master:

Observe AllowItemsOnHandCheckout syspref when using self checkout
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: bug_7090: AllowItemsOnHoldCheckout syspref
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Circulation.pm
CONFLICT (content): Merge conflict in C4/Circulation.pm
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging opac/sco/sco-main.pl
Failed to merge in the changes.
Patch failed at 0001 bug_7090: AllowItemsOnHoldCheckout syspref
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".

-- 
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.
You are watching all bug changes.