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

(-)a/C4/Acquisition.pm (-3 / +9 lines)
Lines 1494-1499 sub SearchOrders { Link Here
1494
    my $basketgroupname = $params->{basketgroupname};
1494
    my $basketgroupname = $params->{basketgroupname};
1495
    my $owner = $params->{owner};
1495
    my $owner = $params->{owner};
1496
    my $pending = $params->{pending};
1496
    my $pending = $params->{pending};
1497
    my $ordered = $params->{ordered};
1497
1498
1498
    my $dbh = C4::Context->dbh;
1499
    my $dbh = C4::Context->dbh;
1499
    my @args = ();
1500
    my @args = ();
Lines 1517-1525 sub SearchOrders { Link Here
1517
        WHERE (datecancellationprinted is NULL)
1518
        WHERE (datecancellationprinted is NULL)
1518
    };
1519
    };
1519
1520
1520
    $query .= q{
1521
    if ( $pending ) {
1521
        AND (quantity > quantityreceived OR quantityreceived is NULL)
1522
        $query .= q{ AND (quantity > quantityreceived OR quantityreceived is NULL)};
1522
    } if $pending;
1523
    }
1524
    if ( $ordered ) {
1525
        $query .= q{ AND (quantity > quantityreceived OR quantityreceived is NULL)}
1526
            unless $pending;
1527
        $query .= q{ AND aqorders.orderstatus IN ( "ordered", "partial" )};
1528
    }
1523
1529
1524
    my $userenv = C4::Context->userenv;
1530
    my $userenv = C4::Context->userenv;
1525
    if ( C4::Context->preference("IndependentBranches") ) {
1531
    if ( C4::Context->preference("IndependentBranches") ) {
(-)a/acqui/parcel.pl (-2 / +2 lines)
Lines 219-224 unless( defined $invoice->{closedate} ) { Link Here
219
            ean => $ean,
219
            ean => $ean,
220
            basketgroupname => $basketgroupname,
220
            basketgroupname => $basketgroupname,
221
            pending => 1,
221
            pending => 1,
222
            ordered => 1,
222
        });
223
        });
223
        $template->param(
224
        $template->param(
224
            summaryfilter => $search,
225
            summaryfilter => $search,
Lines 230-236 unless( defined $invoice->{closedate} ) { Link Here
230
    }else{
231
    }else{
231
        $pendingorders = SearchOrders({
232
        $pendingorders = SearchOrders({
232
            booksellerid => $booksellerid,
233
            booksellerid => $booksellerid,
233
            pending => 1
234
            ordered => 1
234
        });
235
        });
235
    }
236
    }
236
    my $countpendings = scalar @$pendingorders;
237
    my $countpendings = scalar @$pendingorders;
237
- 

Return to bug 11170