Attachment 92448 Details for Bug 23397 – Bug 23397: Fix grouping of orders in acqui scripts

[patch] Bug 23397: Fix grouping of orders in acqui scripts

Bug-23397-Fix-grouping-of-orders-in-acqui-scripts.patch (text/plain), 2.31 KB, created by Marcel de Rooy on 2019-08-23 14:38:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2019-08-23 14:38:39 UTC

Size: 2.31 KB

patch

obsolete

>From 45d42db30eea8dc1a65067b5ecc78ba4617476df Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Mon, 29 Jul 2019 18:12:21 +0000
>Subject: [PATCH] Bug 23397: Fix grouping of orders in acqui scripts
>Content-Type: text/plain; charset=utf-8
>
>Bug 21622 attempted to fix some grouping for strict mode, however, it failed to take into account that single order can have multiple item types.
>
>To recreate:
>1 - Place an order for 4 copies of a title in acq
>2 - Make sure you are creating orders when ordering (AcqCreateItems syspref and/or when creating basket)
>3 - Set three items to one type, and one to another
>4 - Go to Acqui-Home and click 'ordered' for the used budget
>5 - Note the line is duplicated for each itemtype in the order
>6 - Recieve the items and note the same issue on 'Spent'
>7 - Place another order as before so you have the problem in both ordered.pl and spent/pl
>8 - Apply patch
>9 - Note orders are no longer duplicated
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> acqui/ordered.pl | 3 +--
> acqui/spent.pl   | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
>diff --git a/acqui/ordered.pl b/acqui/ordered.pl
>index f6796f2e3f..7899cb8026 100755
>--- a/acqui/ordered.pl
>+++ b/acqui/ordered.pl
>@@ -58,7 +58,7 @@ SELECT
>     ecost_tax_included, budgetdate, entrydate,
>     aqbasket.booksellerid,
>     aqbooksellers.name as vendorname,
>-    itype,
>+    GROUP_CONCAT(DISTINCT itype),
>     title
> FROM (aqorders, aqbasket)
> LEFT JOIN biblio ON
>@@ -80,7 +80,6 @@ WHERE
>              ecost_tax_included, budgetdate, entrydate,
>              aqbasket.booksellerid,
>              aqbooksellers.name,
>-             itype,
>              title
> EOQ
> 
>diff --git a/acqui/spent.pl b/acqui/spent.pl
>index eb26252d4a..95b2de6d43 100755
>--- a/acqui/spent.pl
>+++ b/acqui/spent.pl
>@@ -59,7 +59,7 @@ SELECT
>     quantity-quantityreceived AS tleft,
>     budgetdate, entrydate,
>     aqbasket.booksellerid,
>-    itype,
>+    GROUP_CONCAT(DISTINCT itype),
>     title,
>     aqorders.invoiceid,
>     aqinvoices.invoicenumber,
>@@ -88,7 +88,6 @@ WHERE
>              tleft,
>              budgetdate, entrydate,
>              aqbasket.booksellerid,
>-             itype,
>              title,
>              aqorders.invoiceid,
>              aqinvoices.invoicenumber,
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 23397: 91855 | 92344 | 92446 | 92448 | 92449 | 92450