[Koha-bugs] [Bug 11578] Improvement of the funds list view

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

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

jmbroust <jean-manuel.broust at univ-lyon2.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |jean-manuel.broust at univ-lyo
                   |                            |n2.fr

--- Comment #10 from jmbroust <jean-manuel.broust at univ-lyon2.fr> ---
<h1>Something went wrong !</h1>Applying: Bug 11578: Upgrade the treetable
jquery plugin
Applying: Bug 11578: Improve the funds list view
Using index info to reconstruct a base tree...
<stdin>:476: trailing whitespace.
[% ELSIF ( budget.remaining_neg ) %]
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 11578: Improve the funds list view
When you have resolved this problem run git bz apply --continue.
If you would prefer to skip this patch, instead run git bz apply --skip.
To restore the original branch and stop patching run git bz apply --abort.
Bug 11578 - Improvement of the funds list view

24505 - Bug 11578: Upgrade the treetable jquery plugin
24506 - Bug 11578: Improve the funds list view
24507 - Bug 11578: Add some css
25245 - Bug 11578: Hide inactive budgets by default
25246 - Bug 11578: Align budget names

-- 
You are receiving this mail because:
You are watching all bug changes.