[Koha-bugs] [Bug 21467] Allow several receipts for a given subscription

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #21 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch doesn't apply (on top of bug 21475:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 21467: Allow several receipts for a given subscription
Applying: Bug 21467: Add treetable to subscription detail to group orders by
parent ordernumber
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
Applying: Bug 21467: Add subscription's info when ordering
Applying: Bug 21467: Do not erase the internal note of the first order
Applying: Bug 21467: Display the quantity and adjust the amounts
Applying: Bug 21467: Fix default sort
Applying: Bug 21467: Display a summary line per parent_ordernumber
error: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt).
error: could not build fake ancestor
Patch failed at 0001 Bug 21467: Display a summary line per parent_ordernumber
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".
Patch left in
/tmp/Bug-21467-Display-a-summary-line-per-parentordernu-mjKFO_.patch

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