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

(-)a/C4/Acquisition.pm (-3 / +2 lines)
Lines 692-698 sub GetBasketsInfosByBookseller { Link Here
692
692
693
    my $dbh = C4::Context->dbh;
693
    my $dbh = C4::Context->dbh;
694
    my $query = q{
694
    my $query = q{
695
        SELECT aqbasket.*,
695
        SELECT 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,
696
          SUM(aqorders.quantity) AS total_items,
696
          SUM(aqorders.quantity) AS total_items,
697
          SUM(
697
          SUM(
698
            IF ( aqorders.orderstatus = 'cancelled', aqorders.quantity, 0 )
698
            IF ( aqorders.orderstatus = 'cancelled', aqorders.quantity, 0 )
Lines 711-717 sub GetBasketsInfosByBookseller { Link Here
711
    unless ( $allbaskets ) {
711
    unless ( $allbaskets ) {
712
        $query.=" AND (closedate IS NULL OR (aqorders.quantity > aqorders.quantityreceived AND datecancellationprinted IS NULL))";
712
        $query.=" AND (closedate IS NULL OR (aqorders.quantity > aqorders.quantityreceived AND datecancellationprinted IS NULL))";
713
    }
713
    }
714
    $query.=" GROUP BY aqbasket.basketno";
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
715
716
    my $sth = $dbh->prepare($query);
716
    my $sth = $dbh->prepare($query);
717
    $sth->execute($supplierid);
717
    $sth->execute($supplierid);
718
- 

Return to bug 20144