[Koha-bugs] [Bug 10875] addorderiso2709: the link "show all funds" is missing.
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Sun Sep 29 08:04:37 CEST 2013
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10875
I'm just a bot <gitbot at bugs.koha-community.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
When did the bot| |2013-09-29
last check this| |
--- Comment #6 from I'm just a bot <gitbot at bugs.koha-community.org> ---
Applying: Bug 10875: Add order from a staged file should not display inactive
funds
Using index info to reconstruct a base tree...
M acqui/addorderiso2709.pl
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
Auto-merging acqui/addorderiso2709.pl
Patch failed at 0001 Bug 10875: Add order from a staged file should not display
inactive funds
The copy of the patch that failed is found in:
/home/christopher/git/koha/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list