[Koha-bugs] [Bug 7957] Routing lists: manage several routing list for each subscription, and export them as CSV

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

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

Paola Rossi <paola.rossi at cineca.it> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |paola.rossi at cineca.it

--- Comment #20 from Paola Rossi <paola.rossi at cineca.it> ---
I've tried to apply the patch.

Applying: Bug 7957: Routing lists enhancements
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging serials/subscription-detail.pl
Auto-merging serials/serials-search.pl
CONFLICT (content): Merge conflict in serials/serials-search.pl
Auto-merging serials/serials-collection.pl
CONFLICT (modify/delete): serials/routing.pl deleted in Bug 7957: Routing lists
enhancements and modified in HEAD. Version HEAD of serials/routing.pl left in
tree.
CONFLICT (modify/delete): serials/routing-preview.pl deleted in Bug 7957:
Routing lists enhancements and modified in HEAD. Version HEAD of
serials/routing-preview.pl left in tree.
Removing serials/reorder_members.pl
Auto-merging serials/member-search.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
Removing koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
Removing koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging C4/Serials.pm
Auto-merging C4/Items.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 7957: Routing lists enhancements

So I pass the patch to "Patch doesn't apply" status.

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