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

(-)a/C4/Acquisition.pm (-3 / +4 lines)
Lines 708-717 sub GetBasketsInfosByBookseller { Link Here
708
          LEFT JOIN aqorders ON aqorders.basketno = aqbasket.basketno
708
          LEFT JOIN aqorders ON aqorders.basketno = aqbasket.basketno
709
        WHERE booksellerid = ?};
709
        WHERE booksellerid = ?};
710
710
711
    $query.=" GROUP BY aqbasket.basketno, aqbasket.basketname, aqbasket.note, aqbasket.booksellernote, aqbasket.contractnumber, aqbasket.creationdate, aqbasket.closedate, aqbasket.booksellerid, aqbasket.authorisedby, aqbasket.booksellerinvoicenumber, aqbasket.basketgroupid, aqbasket.deliveryplace, aqbasket.billingplace, aqbasket.branch, aqbasket.is_standing, aqbasket.create_items";
712
711
    unless ( $allbaskets ) {
713
    unless ( $allbaskets ) {
712
        $query.=" AND (closedate IS NULL OR (aqorders.quantity > aqorders.quantityreceived AND datecancellationprinted IS NULL))";
714
        # Don't show the basket if it's NOT CLOSED or is FULLY RECIEVED
715
        $query.=" HAVING (closedate IS NULL OR (expected_items > 0))"
713
    }
716
    }
714
    $query.=" GROUP BY aqbasket.basketno, aqbasket.basketname, aqbasket.note, aqbasket.booksellernote, aqbasket.contractnumber, aqbasket.creationdate, aqbasket.closedate, aqbasket.booksellerid, aqbasket.authorisedby, aqbasket.booksellerinvoicenumber, aqbasket.basketgroupid, aqbasket.deliveryplace, aqbasket.billingplace, aqbasket.branch, aqbasket.is_standing, aqbasket.create_items";
715
717
716
    my $sth = $dbh->prepare($query);
718
    my $sth = $dbh->prepare($query);
717
    $sth->execute($supplierid);
719
    $sth->execute($supplierid);
718
- 

Return to bug 21385