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 <m.de.rooy@rijksmuseum.nl> Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
parent
71f267fd3f
commit
b76eac9ca2
2 changed files with 1 additions and 3 deletions
|
@ -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
|
||||
";
|
||||
|
|
|
@ -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{$_}} ) ;
|
||||
|
|
Loading…
Reference in a new issue