[Koha-bugs] [Bug 5347] late order management

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

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

--- Comment #13 from Katrin Fischer <katrin.fischer at bsz-bw.de> 2011-12-06 19:51:17 UTC ---
Hi Jonathan,
thx for your work on this. I tried to be fast, but was not fast enought - there
is conflict in the css file:

Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 5347: Adds columns claims_count and claimed_date in aqorders
Using index info to reconstruct a base tree...
<stdin>:324: trailing whitespace.
    # send an "account details" notice to a newly created user 
<stdin>:486: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
Failed to merge in the changes.
Patch failed at 0001 Bug 5347: Adds columns claims_count and claimed_date in
aqorders
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".

Can you please fix and add a new patch? Will try to test asap.

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