[Koha-bugs] [Bug 7085] Problems with searching for orders in acquisitions

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Wed Nov 16 15:06:07 CET 2011


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

Chris Nighswonger <cnighswonger at foundations.edu> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |cnighswonger at foundations.ed
                   |                            |u

--- Comment #6 from Chris Nighswonger <cnighswonger at foundations.edu> 2011-11-16 14:06:07 UTC ---
This patch does not apply cleanly to 3.4.x. If it should, please rebase against
that branch and attach a corrected patch to this bug.

cnighs at erasmus:~/koha.3.2.test (3.4.x)$ git cherry-pick -x -s
0c0ddf92113b4a5df6
Automatic cherry-pick failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result with:

        git commit -c 0c0ddf92113b4a5df6833f75ba5b7ad7527c5f48

cnighs at erasmus:~/koha.3.2.test (3.4.x *+)$ git status
# On branch 3.4.x
# Your branch is ahead of 'origin/3.4.x' by 15 commits.
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both modified:      C4/Acquisition.pm

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching all bug changes.


More information about the Koha-bugs mailing list