Attachment #123864 for bug #27287

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

Lines 2084-2089 sub GetHistory { Link Here

(-)a/C4/Acquisition.pm (+14 lines)
2084	my $isbn = $params{isbn};	2084	my $isbn = $params{isbn};
2085	my $ean = $params{ean};	2085	my $ean = $params{ean};
2086	my $name = $params{name};	2086	my $name = $params{name};
		2087	my $internalnote = $params{internalnote};
		2088	my $vendornote = $params{vendornote};
2087	my $from_placed_on = $params{from_placed_on};	2089	my $from_placed_on = $params{from_placed_on};
2088	my $to_placed_on = $params{to_placed_on};	2090	my $to_placed_on = $params{to_placed_on};
2089	my $basket = $params{basket};	2091	my $basket = $params{basket};
Lines 2149-2154 sub GetHistory { Link Here
2149	aqorders.biblionumber,	2151	aqorders.biblionumber,
2150	aqorders.orderstatus,	2152	aqorders.orderstatus,
2151	aqorders.parent_ordernumber,	2153	aqorders.parent_ordernumber,
		2154	aqorders.order_internalnote,
		2155	aqorders.order_vendornote,
2152	aqbudgets.budget_name	2156	aqbudgets.budget_name
2153	";	2157	";
2154	$query .= ", aqbudgets.budget_id AS budget" if defined $budget;	2158	$query .= ", aqbudgets.budget_id AS budget" if defined $budget;
Lines 2241-2246 sub GetHistory { Link Here
2241	}	2245	}
2242	}	2246	}
2243		2247
		2248	if ( $internalnote ) {
		2249	$query .= " AND aqorders.order_internalnote LIKE ? ";
		2250	push @query_params, "%$internalnote%";
		2251	}
		2252
		2253	if ( $vendornote ) {
		2254	$query .= " AND aqorders.order_vendornote LIKE ?";
		2255	push @query_params, "%$vendornote%";
		2256	}
		2257
2244	if ($booksellerinvoicenumber) {	2258	if ($booksellerinvoicenumber) {
2245	$query .= " AND aqinvoices.invoicenumber LIKE ? ";	2259	$query .= " AND aqinvoices.invoicenumber LIKE ? ";
2246	push @query_params, "%$booksellerinvoicenumber%";	2260	push @query_params, "%$booksellerinvoicenumber%";

Lines 76-81 my $filters = { Link Here

(-)a/acqui/histsearch.pl (+2 lines)
76	author => scalar $input->param('author'),	76	author => scalar $input->param('author'),
77	isbn => scalar $input->param('isbn'),	77	isbn => scalar $input->param('isbn'),
78	name => scalar $input->param('name'),	78	name => scalar $input->param('name'),
		79	internalnote => scalar $input->param('internalnote'),
		80	vendornote => scalar $input->param('vendornote'),
79	ean => scalar $input->param('ean'),	81	ean => scalar $input->param('ean'),
80	basketgroupname => scalar $input->param('basketgroupname'),	82	basketgroupname => scalar $input->param('basketgroupname'),
81	budget => scalar $input->param('budget'),	83	budget => scalar $input->param('budget'),

Lines 11-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc (+2 lines)
11	[% END %]	11	[% END %]
12	<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% filters.name \| html %]" /></li>	12	<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% filters.name \| html %]" /></li>
13	<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% filters.basket \| html %]" /></li>	13	<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% filters.basket \| html %]" /></li>
		14	<li><label for="internalnote">Internal note: </label> <input type="text" name="internalnote" id="internalnote" value="[% filters.internalnote \| html %]" /></li>
		15	<li><label for="vendornote">Vendor note: </label> <input type="text" name="vendornote" id="vendornote" value="[% filters.vendornote \| html %]" /></li>
14	<li><label for="basket_creators">Basket created by: </label>	16	<li><label for="basket_creators">Basket created by: </label>
15	<input autocomplete="off" id="find_patron" type="text" class="noEnterSubmit" />	17	<input autocomplete="off" id="find_patron" type="text" class="noEnterSubmit" />
16	<div>	18	<div>

Lines 76-81 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +4 lines)
76	<th>Quantity ordered</th>	76	<th>Quantity ordered</th>
77	<th>Unit cost</th>	77	<th>Unit cost</th>
78	<th>Fund</th>	78	<th>Fund</th>
		79	<th>Internal note</th>
		80	<th>Vendor note</th>
79	</tr>	81	</tr>
80	</thead>	82	</thead>
81	<tbody>	83	<tbody>
Lines 124-129 Link Here
124	<td>[% order.quantity \| html %]</td>	126	<td>[% order.quantity \| html %]</td>
125	<td>[% order.ecost \| html %]</td>	127	<td>[% order.ecost \| html %]</td>
126	<td>[% order.budget_name \| html %]</td>	128	<td>[% order.budget_name \| html %]</td>
		129	<td>[% order.order_internalnote \| html %]</td>
		130	<td>[% order.order_vendornote \| html %]</td>
127	</tr>	131	</tr>
128	[% END %]	132	[% END %]
129	</tbody>	133	</tbody>
130	-

Return to bug 27287