From 1e0375e91c71ceb99d255a5789d82b1257f336b4 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 5 Mar 2014 12:06:47 +0100 Subject: [PATCH] Bug 11755: ensure that SearchOrders returns booksellerid MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The SearchOrders routine should return the booksellerid and this patch adds it. This fixes several problems: [1] The link to the vendor on the order receive page breadcrumbs was broken. [2] The tax calculation in finishreceive.pl didn't run. [3] The item booksellerid field never got updated during receipt. Booksellerid was returned before bug 10723. Quick test plan: Go on orderreceive.pl and verify that the vendor link is correct. Followed test plan. Vendor link is now correct. Signed-off-by: Marc Véron Signed-off-by: Brendan Gallagher Signed-off-by: Galen Charlton --- C4/Acquisition.pm | 1 + t/db_dependent/Acquisition.t | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 7d493c9280..6446a07267 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -1668,6 +1668,7 @@ sub SearchOrders { biblioitems.isbn, biblioitems.biblioitemnumber, aqbasket.authorisedby, + aqbasket.booksellerid, aqbasket.closedate, aqbasket.creationdate, aqbasket.basketname, diff --git a/t/db_dependent/Acquisition.t b/t/db_dependent/Acquisition.t index e78b39cdbc..185b7ac526 100755 --- a/t/db_dependent/Acquisition.t +++ b/t/db_dependent/Acquisition.t @@ -639,6 +639,7 @@ ok( datecancellationprinted budget_id authorisedby + booksellerid ); # note that authorisedby was added to the return of SearchOrder by the @@ -712,7 +713,6 @@ is( scalar (@$search_orders), 0, "SearchOrders with pending and ordered params g # # Test GetBudgetByOrderNumber # - ok( GetBudgetByOrderNumber( $ordernumbers[0] )->{'budget_id'} eq $budgetid, "GetBudgetByOrderNumber returns expected budget" ); -- 2.39.5