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

(-)a/C4/Acquisition.pm (-1 / +1 lines)
Lines 2277-2283 sub GetHistory { Link Here
2277
        push @query_params, $to_placed_on;
2277
        push @query_params, $to_placed_on;
2278
    }
2278
    }
2279
2279
2280
    if ( defined $orderstatus and $orderstatus ne '') {
2280
    if ( defined $orderstatus and $orderstatus ne '' and $orderstatus ne 'any') {
2281
        $query .= " AND aqorders.orderstatus = ? ";
2281
        $query .= " AND aqorders.orderstatus = ? ";
2282
        push @query_params, "$orderstatus";
2282
        push @query_params, "$orderstatus";
2283
    }
2283
    }
(-)a/acqui/duplicate_orders.pl (-6 lines)
Lines 85-91 if ( $op eq 'select' ) { Link Here
85
85
86
    # Set filter for 'all status'
86
    # Set filter for 'all status'
87
    if ( $filters->{orderstatus} eq "any" ) {
87
    if ( $filters->{orderstatus} eq "any" ) {
88
        delete( $filters->{orderstatus} );
89
        $filters->{get_canceled_order} = 1;
88
        $filters->{get_canceled_order} = 1;
90
    }
89
    }
91
90
Lines 94-104 if ( $op eq 'select' ) { Link Here
94
        ( grep {$_ eq $order->{ordernumber}} @ordernumbers ) ? () : $order
93
        ( grep {$_ eq $order->{ordernumber}} @ordernumbers ) ? () : $order
95
    } @{ C4::Acquisition::GetHistory(%$filters) };
94
    } @{ C4::Acquisition::GetHistory(%$filters) };
96
95
97
    # Reset order status for 'all status'
98
    if ( $filters->{get_canceled_order} ) {
99
        $filters->{orderstatus} = "any";
100
    }
101
102
    @selected_order_loop =
96
    @selected_order_loop =
103
      scalar @ordernumbers
97
      scalar @ordernumbers
104
      ? @{ C4::Acquisition::GetHistory( ordernumbers => \@ordernumbers ) }
98
      ? @{ C4::Acquisition::GetHistory( ordernumbers => \@ordernumbers ) }
(-)a/acqui/histsearch.pl (-7 lines)
Lines 116-122 $filters->{additional_fields} = \@additional_field_filters; Link Here
116
116
117
# Set filter for 'all status'
117
# Set filter for 'all status'
118
if ( $filters->{orderstatus} eq "any" ) {
118
if ( $filters->{orderstatus} eq "any" ) {
119
    delete( $filters->{orderstatus} );
120
    $filters->{get_canceled_order} = 1;
119
    $filters->{get_canceled_order} = 1;
121
}
120
}
122
121
Lines 126-136 if ($do_search) { Link Here
126
    $order_loop = GetHistory(%$filters);
125
    $order_loop = GetHistory(%$filters);
127
}
126
}
128
127
129
# Reset order status for 'all status'
130
if ( $filters->{get_canceled_order} ) {
131
    $filters->{orderstatus} = "any";
132
}
133
134
my $budgetperiods = C4::Budgets::GetBudgetPeriods;
128
my $budgetperiods = C4::Budgets::GetBudgetPeriods;
135
my $bp_loop = $budgetperiods;
129
my $bp_loop = $budgetperiods;
136
for my $bp ( @{$budgetperiods} ) {
130
for my $bp ( @{$budgetperiods} ) {
137
- 

Return to bug 14092