From 7a48270a212d69aa375e0124e1bfd1fc8a3baf63 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 22 Nov 2015 02:23:11 +0100 Subject: [PATCH] Bug 15216: Returns - Show branch names and item type description MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Changes the table with returned items to display the branch names for home and holding branch and the itemtype description instead of the codes. To test: - Check out some items - Return the items - Verify the changes in the table of returned items Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 84a0f1acf6ef052cc83eb4c0f6c07127b4cfaae2) Signed-off-by: Julian Maurice (cherry picked from commit efeeffb0645ffd7c2b84629618ad0c60882e8517) Signed-off-by: Frédéric Demians --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 14b58420b9..29a1125e3d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -2,6 +2,7 @@ [% USE Branches %] [% USE Koha %] [% USE Borrowers %] +[% USE ItemTypes %] [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] @@ -578,11 +579,11 @@ $(document).ready(function () { [% riloo.itemtitle |html %] [% riloo.itemauthor %] [% riloo.barcode %] - [% riloo.homebranch %] - [% riloo.holdingbranch %] + [% Branches.GetName( riloo.homebranch ) %] + [% Branches.GetName( riloo.holdingbranch ) %] [% riloo.location %] [% riloo.itemcallnumber %] - [% riloo.itemtype %] [% riloo.ccode %] + [% ItemTypes.GetDescription( riloo.itemtype ) %] [% riloo.ccode %] [% IF ( riloo.duedate ) %] [% riloo.borsurname %], [% riloo.borfirstname %] ([% riloo.borcategorycode %]) -- 2.39.5