[Koha-bugs] [Bug 8382] It is not possible to cancel an order when receiving on a filtered page in parcel.pl

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8382

--- Comment #24 from Chris Cormack <chris at 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.