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

(-)a/C4/Acquisition.pm (+14 lines)
Lines 2085-2090 sub GetHistory { Link Here
2085
    my $isbn   = $params{isbn};
2085
    my $isbn   = $params{isbn};
2086
    my $ean    = $params{ean};
2086
    my $ean    = $params{ean};
2087
    my $name = $params{name};
2087
    my $name = $params{name};
2088
    my $internalnote = $params{internalnote};
2089
    my $vendornote = $params{vendornote};
2088
    my $from_placed_on = $params{from_placed_on};
2090
    my $from_placed_on = $params{from_placed_on};
2089
    my $to_placed_on = $params{to_placed_on};
2091
    my $to_placed_on = $params{to_placed_on};
2090
    my $basket = $params{basket};
2092
    my $basket = $params{basket};
Lines 2150-2155 sub GetHistory { Link Here
2150
            aqorders.biblionumber,
2152
            aqorders.biblionumber,
2151
            aqorders.orderstatus,
2153
            aqorders.orderstatus,
2152
            aqorders.parent_ordernumber,
2154
            aqorders.parent_ordernumber,
2155
            aqorders.order_internalnote,
2156
            aqorders.order_vendornote,
2153
            aqbudgets.budget_name
2157
            aqbudgets.budget_name
2154
            ";
2158
            ";
2155
    $query .= ", aqbudgets.budget_id AS budget" if defined $budget;
2159
    $query .= ", aqbudgets.budget_id AS budget" if defined $budget;
Lines 2242-2247 sub GetHistory { Link Here
2242
        }
2246
        }
2243
    }
2247
    }
2244
2248
2249
    if ( $internalnote ) {
2250
        $query .= " AND aqorders.order_internalnote LIKE ? ";
2251
        push @query_params, "%$internalnote%";
2252
    }
2253
2254
    if ( $vendornote ) {
2255
        $query .= " AND aqorders.order_vendornote LIKE ?";
2256
        push @query_params, "%$vendornote%";
2257
    }
2258
2245
    if ($booksellerinvoicenumber) {
2259
    if ($booksellerinvoicenumber) {
2246
        $query .= " AND aqinvoices.invoicenumber LIKE ? ";
2260
        $query .= " AND aqinvoices.invoicenumber LIKE ? ";
2247
        push @query_params, "%$booksellerinvoicenumber%";
2261
        push @query_params, "%$booksellerinvoicenumber%";
(-)a/acqui/histsearch.pl (+2 lines)
Lines 76-81 my $filters = { Link Here
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'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc (+2 lines)
Lines 11-16 Link Here
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>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +4 lines)
Lines 76-81 Link Here
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