http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8382 --- Comment #26 from Chris Cormack <chris@bigballofwax.co.nz> --- Yep, You can see in the patch this bit -my $datereceived = ($input->param('op') eq 'new') ? C4::Dates->new($input->param('datereceived')) - : C4::Dates->new($input->param('datereceived'), 'iso') ; +my $datereceived = ($input->param('op') eq ('new' or "search")) ? C4::Dates->new($input->param('datereceived')) + : C4::Dates->new($input->param('datereceived'), 'iso'); This is the bit that is conflicting, I can fix the conflict if you are sure the search bit is to do with this change, not something that has already gone into master? -- You are receiving this mail because: You are watching all bug changes.