From e0e6b96f452b899f186b21ead1bfac5e24ec5dbc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 4 Apr 2013 12:09:37 +0200 Subject: [PATCH] Bug 10090: Add itemtype description instead of code On ordered.pl and spent.pl, the itemtype codes are displayed, instead of descriptions. Links for the ordernumber should be changed. In ordered.pl, we are redirected to the receive page. In spent.pl, the links are deleted. Signed-off-by: Broust --- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 5 +++-- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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 05a3321..8a4d577 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE ItemTypes %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Ordered @@ -57,7 +58,7 @@ [% IF ( CAN_user_acquisition_order_manage ) %] - [% order.ordernumber %] + [% order.ordernumber %] [% ELSE %] [% order.ordernumber %] [% END %] @@ -66,7 +67,7 @@ [% order.booksellerid %] - [% order.itype %] + [% ItemTypes.GetDescription( order.itype ) %] [% order.left %] 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 81fe3e4..0d88dfd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE ItemTypes %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Spent @@ -60,7 +61,7 @@ [% order.title %] - [% order.ordernumber %] + [% order.ordernumber %] [% order.booksellerid %] @@ -69,7 +70,7 @@ [% order.invoicenumber %] - [% order.itype %] + [% ItemTypes.GetDescription( order.itype ) %] [% order.quantityreceived %] -- 1.7.2.5