[Koha-bugs] [Bug 20830] Make sure a fund is selected when ordering from staged file

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20830

Pierre-Marc Thibault <pierre-marc.thibault at inlibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |pierre-marc.thibault at inlibr
                   |                            |o.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #6 from Pierre-Marc Thibault <pierre-marc.thibault at inlibro.com> ---
When I try to apply, I have this error message :

Applying: Bug 20830: Make sure a fund is selected when ordering from staged
file
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
error: Failed to merge in the changes.

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