From c7584ae881f551f6e198b76b6850793bb9da6f39 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Mon, 20 Apr 2020 18:41:37 +0000 Subject: [PATCH] Bug 25223: Make join of aqbasket and aqorders explicit This is simply a SQL change that makes things a bit easier to read and also prevents too much data being returned in a large system To test: 1 - Have some orders in your system in the ordered status 2 - Click the 'Ordered' amount for your budget from Acquisitions home 3 - Note the view of orders, possibly screen shot 4 - Apply patch 5 - Restart all the things 6 - Reload the ordered page 7 - Confirm nothing has changed Signed-off-by: David Nind Signed-off-by: Jonathan Druart --- acqui/ordered.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acqui/ordered.pl b/acqui/ordered.pl index b490f42d33..8f095302dd 100755 --- a/acqui/ordered.pl +++ b/acqui/ordered.pl @@ -60,7 +60,8 @@ SELECT aqbooksellers.name as vendorname, GROUP_CONCAT(DISTINCT itype SEPARATOR '|') AS itypes, title -FROM (aqorders, aqbasket) +FROM aqorders +JOIN aqbasket USING (basketno) LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber LEFT JOIN aqorders_items ON @@ -70,7 +71,6 @@ LEFT JOIN items ON LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id WHERE - aqorders.basketno=aqbasket.basketno AND budget_id=? AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00') AND -- 2.20.1