[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Wed Mar 14 13:45:03 CET 2018
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318
Séverine Queune <severine.queune at bulac.fr> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |severine.queune at bulac.fr
Status|Needs Signoff |Failed QA
--- Comment #2 from Séverine Queune <severine.queune at bulac.fr> ---
Applying: Bug 20318: Merge invoices can lead to an merged invoice without
Invoice number
Using index info to reconstruct a base tree...
M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 20318: Merge invoices can lead to an merged invoice
without Invoice number
The copy of the patch that failed is found in:
/var/repositories/koha/.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".
Patch left in
/tmp/Merge-invoices-can-lead-to-an-merged-invoice-witho-SIyTfk.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list