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

(-)a/C4/Acquisition.pm (+13 lines)
Lines 2196-2201 sub GetHistory { Link Here
2196
    my $orderstatus = $params{orderstatus};
2196
    my $orderstatus = $params{orderstatus};
2197
    my $biblionumber = $params{biblionumber};
2197
    my $biblionumber = $params{biblionumber};
2198
    my $get_canceled_order = $params{get_canceled_order} || 0;
2198
    my $get_canceled_order = $params{get_canceled_order} || 0;
2199
    my $ordernumber = $params{ordernumber};
2200
    my $search_children_too = $params{search_children_too} || 0;
2199
2201
2200
    my @order_loop;
2202
    my @order_loop;
2201
    my $total_qty         = 0;
2203
    my $total_qty         = 0;
Lines 2323-2328 sub GetHistory { Link Here
2323
        push @query_params, "%$basketgroupname%";
2325
        push @query_params, "%$basketgroupname%";
2324
    }
2326
    }
2325
2327
2328
    if ($ordernumber) {
2329
        $query .= " AND (aqorders.ordernumber = ? ";
2330
        push @query_params, $ordernumber;
2331
        if ($search_children_too) {
2332
            $query .= " OR aqorders.parent_ordernumber = ? ";
2333
            push @query_params, $ordernumber;
2334
        }
2335
        $query .= ") ";
2336
    }
2337
2338
2326
    if ( C4::Context->preference("IndependentBranches") ) {
2339
    if ( C4::Context->preference("IndependentBranches") ) {
2327
        unless ( C4::Context->IsSuperLibrarian() ) {
2340
        unless ( C4::Context->IsSuperLibrarian() ) {
2328
            $query .= " AND (borrowers.branchcode = ? OR borrowers.branchcode ='' ) ";
2341
            $query .= " AND (borrowers.branchcode = ? OR borrowers.branchcode ='' ) ";
(-)a/acqui/histsearch.pl (+6 lines)
Lines 74-79 my $from_placed_on = C4::Dates->new($input->param('from')); Link Here
74
my $to_placed_on            = C4::Dates->new($input->param('to'));
74
my $to_placed_on            = C4::Dates->new($input->param('to'));
75
my $budget                  = $input->param( 'budget' );
75
my $budget                  = $input->param( 'budget' );
76
my $orderstatus             = $input->param( 'orderstatus' );
76
my $orderstatus             = $input->param( 'orderstatus' );
77
my $ordernumber             = $input->param( 'ordernumber' );
78
my $search_children_too     = $input->param( 'search_children_too' );
77
79
78
if ( not $input->param('from') ) {
80
if ( not $input->param('from') ) {
79
    # FIXME Dirty but we can't sent a Date::Calc to C4::Dates ?
81
    # FIXME Dirty but we can't sent a Date::Calc to C4::Dates ?
Lines 117-122 if ($do_search) { Link Here
117
        basketgroupname => $basketgroupname,
119
        basketgroupname => $basketgroupname,
118
        budget => $budget,
120
        budget => $budget,
119
        orderstatus => $orderstatus,
121
        orderstatus => $orderstatus,
122
        ordernumber => $ordernumber,
123
        search_children_too => $search_children_too,
120
    );
124
    );
121
}
125
}
122
126
Lines 147-152 $template->param( Link Here
147
    basket                  => $basket,
151
    basket                  => $basket,
148
    booksellerinvoicenumber => $booksellerinvoicenumber,
152
    booksellerinvoicenumber => $booksellerinvoicenumber,
149
    basketgroupname         => $basketgroupname,
153
    basketgroupname         => $basketgroupname,
154
    ordernumber             => $ordernumber,
155
    search_children_too     => $search_children_too,
150
    from_placed_on          => $from_date,
156
    from_placed_on          => $from_date,
151
    to_placed_on            => $to_date,
157
    to_placed_on            => $to_date,
152
    orderstatus             => $orderstatus,
158
    orderstatus             => $orderstatus,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +10 lines)
Lines 47-52 Link Here
47
            <label for="basketgroupname">Basket group:</label>
47
            <label for="basketgroupname">Basket group:</label>
48
            <input type="text" name="basketgroupname" id="basketgroupname" value="[% basketgroupname %]" />
48
            <input type="text" name="basketgroupname" id="basketgroupname" value="[% basketgroupname %]" />
49
        </li>
49
        </li>
50
        <li>
51
          <label for="ordernumber">Order no.:</label>
52
          <input type="text" name="ordernumber" id="ordernumber" value="[% ordernumber %]" />
53
          [% IF search_children_too %]
54
            <input type="checkbox" name="search_children_too" id="search_children_too" value="1" checked="checked" />
55
          [% ELSE %]
56
            <input type="checkbox" name="search_children_too" id="search_children_too" value="1" />
57
          [% END %]
58
          <label class="yesno" for="search_children_too">Display children too.</label>
59
        </li>
50
60
51
        <li>
61
        <li>
52
            <label for="orderstatus">Order status: </label>
62
            <label for="orderstatus">Order status: </label>
53
- 

Return to bug 11551