http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8382
--- Comment #24 from Chris Cormack <ch...@bigballofwax.co.nz> ---
(In reply to comment #23)
> Created attachment 12913 [details]
> proposed patch to match 3.8.x
>
> Hello Chris,
> done, I hope this one is ok.
> For the follow up I had no conflicts so it must be ok.
> thx
Unfortunately still has a conflict.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
Auto-merging acqui/parcel.pl
CONFLICT (content): Merge conflict in acqui/parcel.pl
Auto-merging C4/Acquisition.pm
Looks like something to do search has snuck in
my $datereceived = ($input->param('op') eq ('new' or "search"))
Should that be in 3.8.x?
--
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/
