[Koha-bugs] [Bug 19030] Link order <-> subscription is lost when an order is edited
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Tue Apr 17 13:42:32 CEST 2018
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19030
Séverine Queune <severine.queune at bulac.fr> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #11 from Séverine Queune <severine.queune at bulac.fr> ---
Hi Jonathan,
I failed when I try to apply it :
$ git bz apply 19030
Bug 19030 - Link order <-> subscription is lost when an order is edited
74313 - Bug 19030: Preserve link between order and subscription when editing an
order
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19030: Preserve link between order and subscription when editing
an order
Using index info to reconstruct a base tree...
M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 19030: Preserve link between order and subscription
when editing an order
The copy of the patch that failed is found in:
/var/repositories/koha/.git/rebase-apply/patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list