[Koha-bugs] [Bug 13001] Refactor VAT and price calculation - parcel page

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

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

--- Comment #11 from Paola Rossi <paola.rossi at cineca.it> ---
Today I've tried to apply the patches against master 3.17.00.058 head 13297

I should have applied this sequence:

12852 PQA (32275, 32276, 32277)
12896 PQA (33332 33333)
12969 SO (31920 31921)
12976 SO (31983 33573 33613)
13001 (31982 33677)

But :

Applying: Bug 12896: Move the bookseller-related code into
Koha::Acquisition::Bookseller
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging acqui/newordersuggestion.pl
CONFLICT (content): Merge conflict in acqui/newordersuggestion.pl
Auto-merging acqui/addorderiso2709.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 12896: Move the bookseller-related code into
Koha::Acquisition::Bookseller

[I keep this patch 13001 in the "Signed Off" status.]

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