Bugzilla – Attachment 79482 Details for
Bug 19271
Ordered/Spent lists should display vendor name, not vendor code
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19271: Show vendor name on ordered/spent lists
Bug-19271-Show-vendor-name-on-orderedspent-lists.patch (text/plain), 3.79 KB, created by
Martin Renvoize (ashimema)
on 2018-09-27 11:47:29 UTC
(
hide
)
Description:
Bug 19271: Show vendor name on ordered/spent lists
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2018-09-27 11:47:29 UTC
Size:
3.79 KB
patch
obsolete
>From 27ea657096711e8d04d180475db075da5aec1b94 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >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 <martin.renvoize@ptfs-europe.com> >--- > 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 e39349092e..cc3f04918d 100755 >--- a/acqui/ordered.pl >+++ b/acqui/ordered.pl >@@ -56,6 +56,7 @@ SELECT > quantity-quantityreceived AS tleft, > ecost, budgetdate, entrydate, > aqbasket.booksellerid, >+ aqbooksellers.name as vendorname, > itype, > title > FROM (aqorders, aqbasket) >@@ -65,6 +66,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 988b8c28ee..8909eb03e0 100755 >--- a/acqui/spent.pl >+++ b/acqui/spent.pl >@@ -64,7 +64,8 @@ SELECT > aqinvoices.invoicenumber, > quantityreceived, > unitprice, >- datereceived >+ datereceived, >+ aqbooksellers.name as vendorname > FROM (aqorders, aqbasket) > LEFT JOIN biblio ON > biblio.biblionumber=aqorders.biblionumber >@@ -74,6 +75,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 44f256a766..179ba33bb7 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 %] > </td> > <td class="cell"> >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.booksellerid | html %]</a> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.vendorname | html %]</a> > </td> > <td class="cell"> > [% ItemTypes.GetDescription( order.itype ) | html %] >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 d3cae4fb4a..67289b1379 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 | html %] > </td> > <td class="cell"> >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.booksellerid | html %]</a> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.vendorname | html %]</a> > </td> > <td class="cell"> > <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | html %]">[% order.invoicenumber | html %]</a> >-- >2.18.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19271
:
77705
|
78979
|
79482
|
79483
|
79613