diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm index eaf486afc2..dff325ef1f 100644 --- a/C4/Bookseller.pm +++ b/C4/Bookseller.pm @@ -70,8 +70,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 fe1acc37f8..9febcf65c9 100755 --- a/acqui/lateorders.pl +++ b/acqui/lateorders.pl @@ -134,7 +134,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{$_}} ) ;