[Koha-bugs] [Bug 5349] Moving an order

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Thu May 31 11:08:56 CEST 2012


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

Koha Team Lyon 3 <koha at univ-lyon3.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |koha at univ-lyon3.fr

--- Comment #5 from Koha Team Lyon 3 <koha at univ-lyon3.fr> ---
Tested on a sandbox :

Applying: Bug 5349: Order line transfers
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Acquisition.pm
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 5349: Order line transfers
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Bug 5349 - Moving an order

Order line transfers
Apply? [yn]
Patch left in /tmp/Order-line-transfers-1v2GJM.patch

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


More information about the Koha-bugs mailing list