gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 7168: Add basket group search field in histsearch.pl 

Allow to search orders by basket group name

Signed-off-by: Marc Veron <veron@veron.ch>

Displays search field for baketgroup as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This commit is contained in:
Julian Maurice 2012-08-07 15:07:36 +02:00 committed by Paul Poulain
parent 839c97ab30
commit 04539f5cb8
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
C4/Acquisition.pm
View File

@ -1761,6 +1761,7 @@ sub GetHistory {
my $to_placed_on = $params{to_placed_on};
my $basket = $params{basket};
my $booksellerinvoicenumber = $params{booksellerinvoicenumber};
my $basketgroupname = $params{basketgroupname};
my @order_loop;
my $total_qty = 0;
my $total_qtyreceived = 0;
@ -1850,6 +1851,11 @@ sub GetHistory {
push @query_params, "%$booksellerinvoicenumber%", "%$booksellerinvoicenumber%";
}
if ($basketgroupname) {
$query .= " AND aqbasketgroups.name LIKE ? ";
push @query_params, "%$basketgroupname%";
}
if ( C4::Context->preference("IndependantBranches") ) {
my $userenv = C4::Context->userenv;
if ( $userenv && ($userenv->{flags} || 0) != 1 ) {

3
acqui/histsearch.pl
View File

@ -65,6 +65,7 @@ my $isbn = $input->param('isbn');
my $name = $input->param( 'name' );
my $ean = $input->param('ean');
my $basket = $input->param( 'basket' );
my $basketgroupname = $input->param('basketgroupname');
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
my $do_search = $input->param('do_search') || 0;
my $from_placed_on = C4::Dates->new($input->param('from'));
@ -108,6 +109,7 @@ if ($do_search) {
to_placed_on => $to_iso,
basket => $basket,
booksellerinvoicenumber => $booksellerinvoicenumber,
basketgroupname => $basketgroupname,
);
}
@ -127,6 +129,7 @@ $template->param(
name => $name,
basket => $basket,
booksellerinvoicenumber => $booksellerinvoicenumber,
basketgroupname => $basketgroupname,
from_placed_on => $from_date,
to_placed_on => $to_date,
DHTMLcalendar_dateformat=> C4::Dates->DHTMLcalendar(),

4
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
View File

@ -42,6 +42,10 @@
<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
<li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
<li>
<label for="basketgroupname">Basket group:</label>
<input type="text" name="basketgroupname" id="basketgroupname" value="[% basketgroupname %]" />
</li>
<li><label for="from">From: </label>
<input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" class="datepickerfrom" />
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>