View | Details | Raw Unified | Return to bug 7168
Collapse All | Expand All

(-)a/C4/Acquisition.pm (+6 lines)
Lines 1756-1761 sub GetHistory { Link Here
1756
    my $to_placed_on = $params{to_placed_on};
1756
    my $to_placed_on = $params{to_placed_on};
1757
    my $basket = $params{basket};
1757
    my $basket = $params{basket};
1758
    my $booksellerinvoicenumber = $params{booksellerinvoicenumber};
1758
    my $booksellerinvoicenumber = $params{booksellerinvoicenumber};
1759
    my $basketgroupname = $params{basketgroupname};
1759
    my @order_loop;
1760
    my @order_loop;
1760
    my $total_qty         = 0;
1761
    my $total_qty         = 0;
1761
    my $total_qtyreceived = 0;
1762
    my $total_qtyreceived = 0;
Lines 1845-1850 sub GetHistory { Link Here
1845
        push @query_params, "%$booksellerinvoicenumber%", "%$booksellerinvoicenumber%";
1846
        push @query_params, "%$booksellerinvoicenumber%", "%$booksellerinvoicenumber%";
1846
    }
1847
    }
1847
1848
1849
    if ($basketgroupname) {
1850
        $query .= " AND aqbasketgroups.name LIKE ? ";
1851
        push @query_params, "%$basketgroupname%";
1852
    }
1853
1848
    if ( C4::Context->preference("IndependantBranches") ) {
1854
    if ( C4::Context->preference("IndependantBranches") ) {
1849
        my $userenv = C4::Context->userenv;
1855
        my $userenv = C4::Context->userenv;
1850
        if ( $userenv && ($userenv->{flags} || 0) != 1 ) {
1856
        if ( $userenv && ($userenv->{flags} || 0) != 1 ) {
(-)a/acqui/histsearch.pl (+3 lines)
Lines 65-70 my $isbn = $input->param('isbn'); Link Here
65
my $name                    = $input->param( 'name' );
65
my $name                    = $input->param( 'name' );
66
my $ean                     = $input->param('ean');
66
my $ean                     = $input->param('ean');
67
my $basket                  = $input->param( 'basket' );
67
my $basket                  = $input->param( 'basket' );
68
my $basketgroupname             = $input->param('basketgroupname');
68
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
69
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
69
my $do_search               = $input->param('do_search') || 0;
70
my $do_search               = $input->param('do_search') || 0;
70
my $from_placed_on          = C4::Dates->new($input->param('from'));
71
my $from_placed_on          = C4::Dates->new($input->param('from'));
Lines 108-113 if ($do_search) { Link Here
108
        to_placed_on => $to_iso,
109
        to_placed_on => $to_iso,
109
        basket => $basket,
110
        basket => $basket,
110
        booksellerinvoicenumber => $booksellerinvoicenumber,
111
        booksellerinvoicenumber => $booksellerinvoicenumber,
112
        basketgroupname => $basketgroupname,
111
    );
113
    );
112
}
114
}
113
115
Lines 127-132 $template->param( Link Here
127
    name                    => $name,
129
    name                    => $name,
128
    basket                  => $basket,
130
    basket                  => $basket,
129
    booksellerinvoicenumber => $booksellerinvoicenumber,
131
    booksellerinvoicenumber => $booksellerinvoicenumber,
132
    basketgroupname         => $basketgroupname,
130
    from_placed_on          => $from_date,
133
    from_placed_on          => $from_date,
131
    to_placed_on            => $to_date,
134
    to_placed_on            => $to_date,
132
    DHTMLcalendar_dateformat=> C4::Dates->DHTMLcalendar(),
135
    DHTMLcalendar_dateformat=> C4::Dates->DHTMLcalendar(),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +4 lines)
Lines 42-47 Link Here
42
		<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
42
		<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
43
		<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
43
		<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
44
        <li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
44
        <li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
45
        <li>
46
            <label for="basketgroupname">Basket group:</label>
47
            <input type="text" name="basketgroupname" id="basketgroupname" value="[% basketgroupname %]" />
48
        </li>
45
		<li><label for="from">From: </label> 
49
		<li><label for="from">From: </label> 
46
        <input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" class="datepickerfrom" />
50
        <input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" class="datepickerfrom" />
47
				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
51
				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
48
- 

Return to bug 7168