[Koha-bugs] [Bug 5872] Enhancements to circulation (see comment 23 for details)

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

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

Owen Leonard <oleonard at myacpl.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
       Patch Status|Needs Signoff               |Does not apply

--- Comment #35 from Owen Leonard <oleonard at myacpl.org> 2011-08-02 14:55:21 UTC ---
Applying: Bug 5872 : Circulation management enhancements
Using index info to reconstruct a base tree...
<stdin>:99: trailing whitespace.

<stdin>:113: trailing whitespace.
    my $itype = (C4::Context->preference('item-level_itypes')) 
<stdin>:228: trailing whitespace.
                    } else { 
<stdin>:229: trailing whitespace.
                        $count_query .= " JOIN  biblioitems USING
(biblionumber) 
<stdin>:319: space before tab in indent.
            $issuingimpossible{DEBARRED} = format_date($dateenddebarred);
warning: squelched 85 whitespace errors
warning: 90 lines add whitespace errors.
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/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
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
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 5872 : Circulation management enhancements

-- 
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.