Attachment 86974 Details for Bug 21622 – Bug 21622: (RM follow-up) adjust for changes from bug 21282

[patch] Bug 21622: (RM follow-up) adjust for changes from bug 21282

Bug-21622-RM-follow-up-adjust-for-changes-from-bug.patch (text/plain), 1.50 KB, created by Nick Clemens (kidclamp) on 2019-03-25 13:05:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2019-03-25 13:05:28 UTC

Size: 1.50 KB

patch

obsolete

>From d8f3238f1a6a8b523300d9ee555597781d073929 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Mon, 25 Mar 2019 12:58:39 +0000
>Subject: [PATCH] Bug 21622: (RM follow-up) adjust for changes from bug 21282
>
>---
> acqui/ordered.pl | 2 +-
> acqui/spent.pl   | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/acqui/ordered.pl b/acqui/ordered.pl
>index 1ecf813444..ebf89e86d0 100755
>--- a/acqui/ordered.pl
>+++ b/acqui/ordered.pl
>@@ -77,7 +77,7 @@ WHERE
>     (quantity > quantityreceived OR quantityreceived IS NULL)
>     GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
>              tleft,
>-             ecost, budgetdate, entrydate,
>+             ecost_tax_included, budgetdate, entrydate,
>              aqbasket.booksellerid,
>              aqbooksellers.name,
>              itype,
>diff --git a/acqui/spent.pl b/acqui/spent.pl
>index 5d02f618fb..20d2b13c0c 100755
>--- a/acqui/spent.pl
>+++ b/acqui/spent.pl
>@@ -86,14 +86,14 @@ WHERE
>     datereceived IS NOT NULL
>     GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
>              tleft,
>-             ecost, budgetdate, entrydate,
>+             budgetdate, entrydate,
>              aqbasket.booksellerid,
>              itype,
>              title,
>              aqorders.invoiceid,
>              aqinvoices.invoicenumber,
>              quantityreceived,
>-             unitprice,
>+             unitprice_tax_included,
>              datereceived,
>              aqbooksellers.name
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21622: 80943 | 81596 | 81724 | 81725 | 84101 | 84679 | 86973 | 86974