http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11122
David Cook <dc...@prosentient.com.au> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |dc...@prosentient.com.au
--- Comment #13 from David Cook <dc...@prosentient.com.au> ---
Fridolyn: I agree that changing the templates to include copyrightdate would be
another bug, since the templates don't include it already.
However, I think it would still be prudent to add biblio.copyrightdate to your
patch, since it was already included in the past with the biblio.* select.
In any case, this patch needs to be rebased, as 3.14.0 (I think) merged
"SearchOrders" and "GetPendingOrders".
--
Bug 11122 - publisher code and publication year not fetched in acq orders
22306 - Bug 11122 - publisher code and publication year not fetched in acq
orders
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 11122 - publisher code and publication year not fetched in acq
orders
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
Auto-merging acqui/uncertainprice.pl
CONFLICT (content): Merge conflict in acqui/uncertainprice.pl
Auto-merging C4/Acquisition.pm
CONFLICT (content): Merge conflict in C4/Acquisition.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 11122 - publisher code and publication year not
fetched in acq orders
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".
--
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/
