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

(-)a/C4/Acquisition.pm (-3 / +9 lines)
Lines 1665-1670 sub SearchOrders { Link Here
1665
    my $basketgroupname = $params->{basketgroupname};
1665
    my $basketgroupname = $params->{basketgroupname};
1666
    my $owner = $params->{owner};
1666
    my $owner = $params->{owner};
1667
    my $pending = $params->{pending};
1667
    my $pending = $params->{pending};
1668
    my $ordered = $params->{ordered};
1668
1669
1669
    my $dbh = C4::Context->dbh;
1670
    my $dbh = C4::Context->dbh;
1670
    my @args = ();
1671
    my @args = ();
Lines 1690-1698 sub SearchOrders { Link Here
1690
        WHERE (datecancellationprinted is NULL)
1691
        WHERE (datecancellationprinted is NULL)
1691
    };
1692
    };
1692
1693
1693
    $query .= q{
1694
    if ( $pending ) {
1694
        AND (quantity > quantityreceived OR quantityreceived is NULL)
1695
        $query .= q{ AND (quantity > quantityreceived OR quantityreceived is NULL)};
1695
    } if $pending;
1696
    }
1697
    if ( $ordered ) {
1698
        $query .= q{ AND (quantity > quantityreceived OR quantityreceived is NULL)}
1699
            unless $pending;
1700
        $query .= q{ AND aqorders.orderstatus IN ( "ordered", "partial" )};
1701
    }
1696
1702
1697
    my $userenv = C4::Context->userenv;
1703
    my $userenv = C4::Context->userenv;
1698
    if ( C4::Context->preference("IndependentBranches") ) {
1704
    if ( C4::Context->preference("IndependentBranches") ) {
(-)a/acqui/parcel.pl (-2 / +2 lines)
Lines 228-233 unless( defined $invoice->{closedate} ) { Link Here
228
            ean => $ean,
228
            ean => $ean,
229
            basketgroupname => $basketgroupname,
229
            basketgroupname => $basketgroupname,
230
            pending => 1,
230
            pending => 1,
231
            ordered => 1,
231
        });
232
        });
232
        $template->param(
233
        $template->param(
233
            summaryfilter => $search,
234
            summaryfilter => $search,
Lines 239-245 unless( defined $invoice->{closedate} ) { Link Here
239
    }else{
240
    }else{
240
        $pendingorders = SearchOrders({
241
        $pendingorders = SearchOrders({
241
            booksellerid => $booksellerid,
242
            booksellerid => $booksellerid,
242
            pending => 1
243
            ordered => 1
243
        });
244
        });
244
    }
245
    }
245
    my $countpendings = scalar @$pendingorders;
246
    my $countpendings = scalar @$pendingorders;
246
- 

Return to bug 11170