From b88099c740f51a2285d308acd7c5dc2a56bc5004 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 26 Apr 2013 09:30:23 +0200 Subject: [PATCH] Bug 10724: Pending orders: add basket group name in filters This patch adds a new filter "basket group name" for pending orders searches. Test plan: Try different filters and check that results are consistent. Try to filter by basket group name. Signed-off-by: Pierre Angot --- acqui/parcel.pl | 3 + .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 77 +++++++++----------- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/acqui/parcel.pl b/acqui/parcel.pl index 27be3c8..028e957 100755 --- a/acqui/parcel.pl +++ b/acqui/parcel.pl @@ -208,12 +208,14 @@ if(!defined $invoice->{closedate}) { my $ean = $input->param('eanfilter') || ''; my $basketname = $input->param('basketfilter') || ''; my $orderno = $input->param('orderfilter') || ''; + my $basketgroupname = $input->param('basketgroupnamefilter') || ''; $pendingorders = SearchOrders({ booksellerid => $booksellerid, basketname => $basketname, ordernumber => $orderno, search => $search, ean => $ean, + basketgroupname => $basketgroupname, pending => 1, }); $template->param( @@ -221,6 +223,7 @@ if(!defined $invoice->{closedate}) { eanfilter => $ean, basketfilter => $basketname, orderfilter => $orderno, + basketgroupnamefilter => $basketgroupname, ); }else{ $pendingorders = SearchOrders({ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 10382cb..562c2e0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -7,7 +7,6 @@ [% INCLUDE 'datatables-strings.inc' %] [% INCLUDE 'greybox.inc' %] -