[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 #7 from Paola Rossi <paola.rossi at cineca.it> ---
(In reply to Jonathan Druart from comment #6)
> (In reply to Paola Rossi from comment #5)
[...]
> It could you QAer if you add your signoff on the last patch :)

To add the signoff to the patch 13001, I tried to apply:
12852 PQA (3: 32275, 32276, 32277)
12896 PQA (2: 33332 33333)
12969 SO (2)
13001 (2)

Is it right?

But, against master 3.17.00.057 HEAD 13229, :
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...
error: The following untracked working tree files would be overwritten by
merge:
        Koha/Acquisition/Bookseller.pm
Please move or remove them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 Bug 12896: Move the bookseller-related code into
Koha::Acquisition::Bookseller

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

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