Attachment 79362 Details for Bug 21385 – Bug 21385: Correctly count all items in basket for booksellers list

[patch] Bug 21385: Correctly count all items in basket for booksellers list

Bug-21385-Correctly-count-all-items-in-basket-for-.patch (text/plain), 1.76 KB, created by Martin Renvoize (ashimema) on 2018-09-25 11:14:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2018-09-25 11:14:40 UTC

Size: 1.76 KB

patch

obsolete

>From a6cfa3555a757f0d815d4ac33cc30b22387e7ac3 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 21 Sep 2018 15:10:15 +0100
>Subject: [PATCH] Bug 21385: Correctly count all items in basket for
> booksellers list
>
>---
> C4/Acquisition.pm | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index 384b598e43..439ae41e1c 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -708,10 +708,12 @@ sub GetBasketsInfosByBookseller {
>           LEFT JOIN aqorders ON aqorders.basketno = aqbasket.basketno
>         WHERE booksellerid = ?};
> 
>+    $query.=" GROUP BY aqbasket.basketno, aqbasket.basketname, aqbasket.note, aqbasket.booksellernote, aqbasket.contractnumber, aqbasket.creationdate, aqbasket.closedate, aqbasket.booksellerid, aqbasket.authorisedby, aqbasket.booksellerinvoicenumber, aqbasket.basketgroupid, aqbasket.deliveryplace, aqbasket.billingplace, aqbasket.branch, aqbasket.is_standing, aqbasket.create_items";
>+
>     unless ( $allbaskets ) {
>-        $query.=" AND (closedate IS NULL OR (aqorders.quantity > aqorders.quantityreceived AND datecancellationprinted IS NULL))";
>+        # Don't show the basket if it's NOT CLOSED or is FULLY RECIEVED
>+        $query.=" HAVING (closedate IS NULL OR (expected_items > 0))"
>     }
>-    $query.=" GROUP BY aqbasket.basketno, aqbasket.basketname, aqbasket.note, aqbasket.booksellernote, aqbasket.contractnumber, aqbasket.creationdate, aqbasket.closedate, aqbasket.booksellerid, aqbasket.authorisedby, aqbasket.booksellerinvoicenumber, aqbasket.basketgroupid, aqbasket.deliveryplace, aqbasket.billingplace, aqbasket.branch, aqbasket.is_standing, aqbasket.create_items";
> 
>     my $sth = $dbh->prepare($query);
>     $sth->execute($supplierid);
>-- 
>2.18.0

Actions: View | Diff | Splinter Review

Attachments on bug 21385: 79235 | 79280 | 79301 | 79303 | 79304 | 79305 | 79362 | 79363 | 79364 | 79365 | 79721 | 79727 | 79728 | 79729 | 79730