From 8f765aa560f439a75173bb56f4bacfca52fae376 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 (cherry picked from commit 1e0375e91c71ceb99d255a5789d82b1257f336b4) Conflicts: t/db_dependent/Acquisition.t --- C4/Acquisition.pm | 1 + t/db_dependent/Acquisition.t | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index cec5fdbf53..28425cccb5 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -1664,6 +1664,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 1cb6d4be83..36d70150b4 100755 --- a/t/db_dependent/Acquisition.t +++ b/t/db_dependent/Acquisition.t @@ -8,7 +8,7 @@ use POSIX qw(strftime); use C4::Bookseller qw( GetBookSellerFromId ); -use Test::More tests => 63; +use Test::More tests => 64; BEGIN { use_ok('C4::Acquisition'); @@ -103,6 +103,7 @@ is( $neworder->{claimed_date}, strftime( "%Y-%m-%d", localtime(time) ), "AddClai my @expectedfields = qw( basketno biblionumber invoiceid + booksellerid budgetdate cancelledby closedate -- 2.39.5