[Koha-bugs] [Bug 7001] User Configurable Slips

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

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

--- Comment #13 from Melia Meggs <melia at bywatersolutions.com> 2011-12-27 21:42:59 UTC ---
I think this patch still does not apply.  At least not for me...

When I did git bz apply:

Applying: bug_7001: Issue and Reserve slips are notices.
/home/melia/kohaclone/.git/rebase-apply/patch:703: trailing whitespace.

/home/melia/kohaclone/.git/rebase-apply/patch:1037: trailing whitespace.
ITEM RESERVED: 
/home/melia/kohaclone/.git/rebase-apply/patch:2076: trailing whitespace.
    [% UNLESS independant_branch %]        
/home/melia/kohaclone/.git/rebase-apply/patch:2089: trailing whitespace.
    [% END %]        
/home/melia/kohaclone/.git/rebase-apply/patch:2138: trailing whitespace.
        [% END %]        
error: koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt: already
exists in working directory
error: members/printslip.pl: already exists in working directory
error: patch failed: misc/cronjobs/overdue_notices.pl:643
error: misc/cronjobs/overdue_notices.pl: patch does not apply
Patch failed at 0001 bug_7001: Issue and Reserve slips are notices.

When I did git am -iu3:

Applying: bug_7001: Issue and Reserve slips are notices.
error: short SHA1 2ba7584 is ambiguous.
fatal: sha1 information is lacking or useless (C4/Print.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 bug_7001: Issue and Reserve slips are notices.

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