Attachment 61371 Details for Bug 14535 – Bug 14535: Update the supplier filter too

[patch] Bug 14535: Update the supplier filter too

Bug-14535-Update-the-supplier-filter-too.patch (text/plain), 1.89 KB, created by Jonathan Druart on 2017-03-21 11:40:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-03-21 11:40:52 UTC

Size: 1.89 KB

patch

obsolete

>From a1d4e1d021759f1d9ff711abc5d09ba57b8a1a46 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>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 <m.de.rooy@rijksmuseum.nl>
>Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> 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 eaf486a..dff325e 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 fe1acc3..9febcf6 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{$_}} )            ;
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 14535: 59921 | 59922 | 59928 | 61348 | 61349 | 61370 | 61371