From 2a552e68a7478fb08e25762ceb801226357a8ba5 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 6 Feb 2017 10:29:44 +0100 Subject: [PATCH] Bug 14535: Update the supplier filter too The combobox on the left side of late orders is filled by sub GetBooksellersWithLateOrders. The same change as in the first patch must be made here to include suppliers with late orders without a price. Bonus: Sort the list. Test plan: [1] Run t/db_dependent/Bookseller.t. [2] Go to late orders. Use the filter on suppliers. Signed-off-by: Marcel de Rooy Signed-off-by: Srdjan Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit b76eac9ca2c32a5db51b9b8ca32a2cf4fa6397b5) Signed-off-by: Katrin Fischer (cherry picked from commit 92ddd4bbc7f3f40241202ae19750e93d5ee2d30b) Signed-off-by: Julian Maurice --- C4/Bookseller.pm | 2 -- acqui/lateorders.pl | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm index e37eab7742..b56590729c 100644 --- a/C4/Bookseller.pm +++ b/C4/Bookseller.pm @@ -77,8 +77,6 @@ sub GetBooksellersWithLateOrders { OR datereceived IS NULL OR aqorders.quantityreceived < aqorders.quantity ) - AND aqorders.rrp <> 0 - AND aqorders.ecost <> 0 AND aqorders.quantity - COALESCE(aqorders.quantityreceived,0) <> 0 AND aqbasket.closedate IS NOT NULL "; diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl index bf45e30cf7..2aeedff788 100755 --- a/acqui/lateorders.pl +++ b/acqui/lateorders.pl @@ -135,7 +135,7 @@ push @parameters, $estimateddeliverydateto_dt my %supplierlist = GetBooksellersWithLateOrders(@parameters); my (@sloopy); # supplier loop -foreach (keys %supplierlist){ +foreach( sort { $supplierlist{$a} cmp $supplierlist{$b} } keys %supplierlist ) { push @sloopy, (($booksellerid and $booksellerid eq $_ ) ? {id=>$_, name=>$supplierlist{$_}, selected=>1} : {id=>$_, name=>$supplierlist{$_}} ) ; -- 2.39.5