Bug 11755: ensure that SearchOrders returns booksellerid
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 <veron@veron.ch> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
parent
87330b90f4
commit
1e0375e91c
2 changed files with 2 additions and 1 deletions
|
@ -1668,6 +1668,7 @@ sub SearchOrders {
|
||||||
biblioitems.isbn,
|
biblioitems.isbn,
|
||||||
biblioitems.biblioitemnumber,
|
biblioitems.biblioitemnumber,
|
||||||
aqbasket.authorisedby,
|
aqbasket.authorisedby,
|
||||||
|
aqbasket.booksellerid,
|
||||||
aqbasket.closedate,
|
aqbasket.closedate,
|
||||||
aqbasket.creationdate,
|
aqbasket.creationdate,
|
||||||
aqbasket.basketname,
|
aqbasket.basketname,
|
||||||
|
|
|
@ -639,6 +639,7 @@ ok(
|
||||||
datecancellationprinted
|
datecancellationprinted
|
||||||
budget_id
|
budget_id
|
||||||
authorisedby
|
authorisedby
|
||||||
|
booksellerid
|
||||||
);
|
);
|
||||||
|
|
||||||
# note that authorisedby was added to the return of SearchOrder by the
|
# 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
|
# Test GetBudgetByOrderNumber
|
||||||
#
|
#
|
||||||
|
|
||||||
ok( GetBudgetByOrderNumber( $ordernumbers[0] )->{'budget_id'} eq $budgetid,
|
ok( GetBudgetByOrderNumber( $ordernumbers[0] )->{'budget_id'} eq $budgetid,
|
||||||
"GetBudgetByOrderNumber returns expected budget" );
|
"GetBudgetByOrderNumber returns expected budget" );
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue