https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19165
Alex Buckley <alexbuck...@catalyst.net.nz> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |alexbuck...@catalyst.net.nz
Status|Needs Signoff |Patch doesn't apply
--- Comment #2 from Alex Buckley <alexbuck...@catalyst.net.nz> ---
Hi Christophe
Your patch cannot be successfully applied (see below), could you please fix
this up and I will be happy to test again:
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19165 - When adding from a staged file order discounts are not
passed into C4::Acquisitions::populate_order_with_prices
fatal: sha1 information is lacking or useless (acqui/addorderiso2709.pl).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 19165 - When adding from a staged file order discounts
are not passed into C4::Acquisitions::populate_order_with_prices
The copy of the patch that failed is found in:
/home/vagrant/kohaclone/.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/Discounts-are-not-stored-in-orderinfo-before-passi-WXlSlx.patch
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
