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

(-)a/acqui/ordered.pl (-5 / +5 lines)
Lines 62-71 SELECT Link Here
62
FROM (aqorders, aqbasket)
62
FROM (aqorders, aqbasket)
63
LEFT JOIN biblio ON
63
LEFT JOIN biblio ON
64
    biblio.biblionumber=aqorders.biblionumber
64
    biblio.biblionumber=aqorders.biblionumber
65
LEFT JOIN aqorders_items ON
65
LEFT JOIN 
66
    aqorders.ordernumber=aqorders_items.ordernumber
66
    (SELECT ordernumber, GROUP_CONCAT(DISTINCT itype) as itype
67
LEFT JOIN items ON
67
     FROM aqorders_items
68
    items.itemnumber=aqorders_items.itemnumber
68
     LEFT JOIN items USING (itemnumber)
69
     GROUP BY ordernumber) aqitems USING (ordernumber)
69
LEFT JOIN aqbooksellers ON
70
LEFT JOIN aqbooksellers ON
70
    aqbasket.booksellerid = aqbooksellers.id
71
    aqbasket.booksellerid = aqbooksellers.id
71
WHERE
72
WHERE
Lines 74-80 WHERE Link Here
74
    (datecancellationprinted IS NULL OR
75
    (datecancellationprinted IS NULL OR
75
        datecancellationprinted='0000-00-00') AND
76
        datecancellationprinted='0000-00-00') AND
76
    (quantity > quantityreceived OR quantityreceived IS NULL)
77
    (quantity > quantityreceived OR quantityreceived IS NULL)
77
    GROUP BY aqorders.ordernumber
78
EOQ
78
EOQ
79
79
80
my $sth = $dbh->prepare($query);
80
my $sth = $dbh->prepare($query);
(-)a/acqui/spent.pl (-6 / +5 lines)
Lines 69-78 SELECT Link Here
69
FROM (aqorders, aqbasket)
69
FROM (aqorders, aqbasket)
70
LEFT JOIN biblio ON
70
LEFT JOIN biblio ON
71
    biblio.biblionumber=aqorders.biblionumber
71
    biblio.biblionumber=aqorders.biblionumber
72
LEFT JOIN aqorders_items ON
72
LEFT JOIN 
73
    aqorders.ordernumber = aqorders_items.ordernumber
73
    (SELECT ordernumber, GROUP_CONCAT(DISTINCT itype) as itype
74
LEFT JOIN items ON
74
     FROM aqorders_items
75
    aqorders_items.itemnumber = items.itemnumber
75
     LEFT JOIN items USING (itemnumber)
76
     GROUP BY ordernumber) aqitems USING (ordernumber)
76
LEFT JOIN aqinvoices ON
77
LEFT JOIN aqinvoices ON
77
    aqorders.invoiceid = aqinvoices.invoiceid
78
    aqorders.invoiceid = aqinvoices.invoiceid
78
LEFT JOIN aqbooksellers ON
79
LEFT JOIN aqbooksellers ON
Lines 83-89 WHERE Link Here
83
    (datecancellationprinted IS NULL OR
84
    (datecancellationprinted IS NULL OR
84
        datecancellationprinted='0000-00-00') AND
85
        datecancellationprinted='0000-00-00') AND
85
    datereceived IS NOT NULL
86
    datereceived IS NOT NULL
86
    GROUP BY aqorders.ordernumber
87
EOQ
87
EOQ
88
my $sth = $dbh->prepare($query);
88
my $sth = $dbh->prepare($query);
89
$sth->execute($bookfund);
89
$sth->execute($bookfund);
90
- 

Return to bug 22260