[Koha-bugs] [Bug 21167] Correct price formatting on printed fee receipt and invoice

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21167

--- Comment #6 from Cab Vinton <bibliwho at gmail.com> ---
Let me know if I should be changing status (Patch doesn't apply? Failed QA?)

Tested in PTFS Sandbox 0. Biblibre sandboxes are failing silently :-(

<h1>Something went wrong !</h1>Applying: Bug 21167: Fix price formatting on
printed fee invoice and receipt
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
Patch failed at 0001 Bug 21167: Fix price formatting on printed fee invoice and
receipt
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run git bz apply --continue.
If you would prefer to skip this patch, instead run git bz apply --skip.
To restore the original branch and stop patching run git bz apply --abort.
Bug 21167 - Correct price formatting on printed fee receipt and invoice

77596 - Bug 21167: Fix price formatting on printed fee invoice and receipt

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-21167-Fix-price-formatting-on-printed-fee-invo-0XLKVz.patch .

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