From 3e77e7a4d6c90e6a14d152af19c46cda6486e7ac Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 27 Sep 2018 12:29:08 +0100 Subject: [PATCH] Bug 19271: Show vendor name on ordered/spent lists Improvements to the display of lists of ordered and received orders: - Show the vendor's name instead of the internal number To test: - Make sure you have some pending and received orders - Access the Spent and Ordered pages by clicking on the amount ordered or spent on the acq start page - Verify that - Vendor name shows Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 8b1bda9ed8507745b4002199d9aae95c2cbb31fb) Signed-off-by: Martin Renvoize --- acqui/ordered.pl | 3 +++ acqui/spent.pl | 5 ++++- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/acqui/ordered.pl b/acqui/ordered.pl index a976cc9351..73ecb35917 100755 --- a/acqui/ordered.pl +++ b/acqui/ordered.pl @@ -55,6 +55,7 @@ SELECT quantity-quantityreceived AS tleft, ecost, budgetdate, entrydate, aqbasket.booksellerid, + aqbooksellers.name as vendorname, itype, title FROM (aqorders, aqbasket) @@ -64,6 +65,8 @@ LEFT JOIN aqorders_items ON aqorders.ordernumber=aqorders_items.ordernumber LEFT JOIN items ON items.itemnumber=aqorders_items.itemnumber +LEFT JOIN aqbooksellers ON + aqbasket.booksellerid = aqbooksellers.id WHERE aqorders.basketno=aqbasket.basketno AND budget_id=? AND diff --git a/acqui/spent.pl b/acqui/spent.pl index 9a1c8059ec..e17d07c35f 100755 --- a/acqui/spent.pl +++ b/acqui/spent.pl @@ -63,7 +63,8 @@ SELECT aqinvoices.invoicenumber, quantityreceived, unitprice, - datereceived + datereceived, + aqbooksellers.name as vendorname FROM (aqorders, aqbasket) LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber @@ -73,6 +74,8 @@ LEFT JOIN items ON aqorders_items.itemnumber = items.itemnumber LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid +LEFT JOIN aqbooksellers ON + aqbasket.booksellerid = aqbooksellers.id WHERE aqorders.basketno=aqbasket.basketno AND budget_id=? AND diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index 802ae058a9..fb37c529dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -52,7 +52,7 @@ [% END %] - [% order.booksellerid %] + [% order.vendorname | html %] [% ItemTypes.GetDescription( order.itype ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt index ec91e86d59..cd4c630ba3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -50,7 +50,7 @@ [% order.ordernumber %] - [% order.booksellerid %] + [% order.vendorname | html %] [% order.invoicenumber %] -- 2.39.5