@@ -, +, @@ --- C4/Acquisition.pm | 8 ++++-- acqui/parcel.pl | 3 ++- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 28 +++++++++++--------- 3 files changed, 23 insertions(+), 16 deletions(-) --- a/C4/Acquisition.pm +++ a/C4/Acquisition.pm @@ -819,7 +819,7 @@ sub GetBasketgroups { =head3 GetPendingOrders -$orders = &GetPendingOrders($supplierid,$grouped,$owner,$basketno,$ordernumber,$search,$ean); +$orders = &GetPendingOrders($supplierid,$grouped,$owner,$basketno,$ordernumber,$search,$ean,$basketgroupno); Finds pending orders from the bookseller with the given ID. Ignores completed and cancelled orders. @@ -845,7 +845,7 @@ Results are ordered from most to least recent. =cut sub GetPendingOrders { - my ($supplierid,$grouped,$owner,$basketno,$ordernumber,$search,$ean) = @_; + my ($supplierid,$grouped,$owner,$basketno,$ordernumber,$search,$ean,$basketgroupno) = @_; my $dbh = C4::Context->dbh; my $strsth = " SELECT ".($grouped?"count(*),":"")."aqbasket.basketno, @@ -892,6 +892,10 @@ sub GetPendingOrders { $strsth .= " AND aqbasket.authorisedby=? "; push @query_params, $userenv->{'number'}; } + if ($basketgroupno) { + $strsth .= " AND aqbasket.basketgroupid=? "; + push @query_params, $basketgroupno; + } $strsth .= " group by aqbasket.basketno" if $grouped; $strsth .= " order by aqbasket.basketno"; my $sth = $dbh->prepare($strsth); --- a/acqui/parcel.pl +++ a/acqui/parcel.pl @@ -220,9 +220,10 @@ if(!defined $invoice->{closedate}) { my $ean = $input->param('eanfilter') || ''; my $basketno = $input->param('basketfilter') || ''; my $orderno = $input->param('orderfilter') || ''; + my $basketgroupno = $input->param('basketgroupfilter') || ''; my $grouped; my $owner; - $pendingorders = GetPendingOrders($booksellerid,$grouped,$owner,$basketno,$orderno,$search,$ean); + $pendingorders = GetPendingOrders($booksellerid,$grouped,$owner,$basketno,$orderno,$search,$ean,$basketgroupno); }else{ $pendingorders = GetPendingOrders($booksellerid); } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -374,22 +374,24 @@ - + [% IF (UNIMARC) %] +
  • + + +
  • + [% END %]
  • - - -
  • - + + +
  • - - + + +
  • +
  • + +
  • - [% IF (UNIMARC) %] -
  • - - -
  • - [% END %]
    --