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

(-)a/C4/Acquisition.pm (-1 / +8 lines)
Lines 1942-1947 sub GetHistory { Link Here
1942
    my $from_placed_on = $params{from_placed_on};
1942
    my $from_placed_on = $params{from_placed_on};
1943
    my $to_placed_on = $params{to_placed_on};
1943
    my $to_placed_on = $params{to_placed_on};
1944
    my $basket = $params{basket};
1944
    my $basket = $params{basket};
1945
    my $purchaseordernumber = $params{purchaseordernumber};
1945
    my $booksellerinvoicenumber = $params{booksellerinvoicenumber};
1946
    my $booksellerinvoicenumber = $params{booksellerinvoicenumber};
1946
    my $basketgroupname = $params{basketgroupname};
1947
    my $basketgroupname = $params{basketgroupname};
1947
    my @order_loop;
1948
    my @order_loop;
Lines 1970-1976 sub GetHistory { Link Here
1970
            aqorders.invoiceid,
1971
            aqorders.invoiceid,
1971
            aqinvoices.invoicenumber,
1972
            aqinvoices.invoicenumber,
1972
            aqbooksellers.id as id,
1973
            aqbooksellers.id as id,
1973
            aqorders.biblionumber
1974
            aqorders.biblionumber,
1975
            aqorders.purchaseordernumber
1974
        FROM aqorders
1976
        FROM aqorders
1975
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
1977
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
1976
        LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
1978
        LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
Lines 2035-2040 sub GetHistory { Link Here
2035
        push @query_params, "%$booksellerinvoicenumber%";
2037
        push @query_params, "%$booksellerinvoicenumber%";
2036
    }
2038
    }
2037
2039
2040
    if ($purchaseordernumber) {
2041
        $query .= " AND aqorders.purchaseordernumber LIKE ? ";
2042
        push @query_params, "%$purchaseordernumber%";
2043
    }
2044
2038
    if ($basketgroupname) {
2045
    if ($basketgroupname) {
2039
        $query .= " AND aqbasketgroups.name LIKE ? ";
2046
        $query .= " AND aqbasketgroups.name LIKE ? ";
2040
        push @query_params, "%$basketgroupname%";
2047
        push @query_params, "%$basketgroupname%";
(-)a/acqui/histsearch.pl (+3 lines)
Lines 67-72 my $ean = $input->param('ean'); Link Here
67
my $basket                  = $input->param( 'basket' );
67
my $basket                  = $input->param( 'basket' );
68
my $basketgroupname             = $input->param('basketgroupname');
68
my $basketgroupname             = $input->param('basketgroupname');
69
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
69
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
70
my $purchaseordernumber = $input->param( 'purchaseordernumber' );
70
my $do_search               = $input->param('do_search') || 0;
71
my $do_search               = $input->param('do_search') || 0;
71
my $from_placed_on          = C4::Dates->new($input->param('from'));
72
my $from_placed_on          = C4::Dates->new($input->param('from'));
72
my $to_placed_on            = C4::Dates->new($input->param('to'));
73
my $to_placed_on            = C4::Dates->new($input->param('to'));
Lines 110-115 if ($do_search) { Link Here
110
        basket => $basket,
111
        basket => $basket,
111
        booksellerinvoicenumber => $booksellerinvoicenumber,
112
        booksellerinvoicenumber => $booksellerinvoicenumber,
112
        basketgroupname => $basketgroupname,
113
        basketgroupname => $basketgroupname,
114
        purchaseordernumber => $purchaseordernumber,
113
    );
115
    );
114
}
116
}
115
117
Lines 129-134 $template->param( Link Here
129
    name                    => $name,
131
    name                    => $name,
130
    basket                  => $basket,
132
    basket                  => $basket,
131
    booksellerinvoicenumber => $booksellerinvoicenumber,
133
    booksellerinvoicenumber => $booksellerinvoicenumber,
134
    purchaseordernumber     => $purchaseordernumber,
132
    basketgroupname         => $basketgroupname,
135
    basketgroupname         => $basketgroupname,
133
    from_placed_on          => $from_date,
136
    from_placed_on          => $from_date,
134
    to_placed_on            => $to_date,
137
    to_placed_on            => $to_date,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc (+1 lines)
Lines 20-25 Link Here
20
    <p id="filters" style="display:none">
20
    <p id="filters" style="display:none">
21
      <label for="basket">Basket: </label><input type="text" name="basket" id="basket" />
21
      <label for="basket">Basket: </label><input type="text" name="basket" id="basket" />
22
      <label for="booksellerinvoicenumber">Invoice no.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
22
      <label for="booksellerinvoicenumber">Invoice no.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
23
      <label for="purchaseordernumber">Purchase order no.: </label><input type="text" name="purchaseordernumber" id="purchaseordernumber" />
23
    </p>
24
    </p>
24
	</form>
25
	</form>
25
	</div>	
26
	</div>	
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +6 lines)
Lines 49-54 Link Here
49
            <label for="basketgroupname">Basket group:</label>
49
            <label for="basketgroupname">Basket group:</label>
50
            <input type="text" name="basketgroupname" id="basketgroupname" value="[% basketgroupname %]" />
50
            <input type="text" name="basketgroupname" id="basketgroupname" value="[% basketgroupname %]" />
51
        </li>
51
        </li>
52
        <li>
53
            <label for="purchaseordernumber">Purchase order number:</label>
54
            <input type="text" name="purchaseordernumber" id="purchaseordernumber" value="[% purchaseordernumber %]" />
55
        </li>
52
		<li><label for="from">From: </label> 
56
		<li><label for="from">From: </label> 
53
        <input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" class="datepickerfrom" />
57
        <input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" class="datepickerfrom" />
54
				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
58
				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
Lines 71-76 Link Here
71
				<th>Basket group</th>
75
				<th>Basket group</th>
72
                <th>Invoice number</th>
76
                <th>Invoice number</th>
73
                <th>Order number</th>
77
                <th>Order number</th>
78
                <th>Purchase ordernumber</th>
74
				<th>Summary</th>
79
				<th>Summary</th>
75
				<th>Vendor</th>
80
				<th>Vendor</th>
76
				<th>Placed on</th>
81
				<th>Placed on</th>
Lines 97-102 Link Here
97
					    [% END %]
102
					    [% END %]
98
					</td>
103
					</td>
99
                    <td>[% suggestions_loo.ordernumber %]</td>
104
                    <td>[% suggestions_loo.ordernumber %]</td>
105
                    <td>[% suggestions_loo.purchaseordernumber %]</td>
100
					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
106
					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
101
                        <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
107
                        <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
102
					<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
108
					<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
103
- 

Return to bug 10530