[Koha-bugs] [Bug 5358] keep track of cancelled orders

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

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

Jonathan Druart <jonathan.druart at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |jonathan.druart at biblibre.co
                   |                            |m
       Patch Status|Signed Off                  |Does not apply

--- Comment #4 from Jonathan Druart <jonathan.druart at biblibre.com> 2012-01-02 09:19:51 UTC ---
Applying: Bug 5358: Show cancelled orders in basket page
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
Recorded preimage for 'koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt'
Failed to merge in the changes.
Patch failed at 0001 Bug 5358: Show cancelled orders in basket page

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