From 507444a671894dad469897bce6e5f274ebe37614 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 26 May 2016 10:55:09 +0100
Subject: [PATCH] Bug 16596: Display library and patron category descriptions
 instead of their code

Test plan:
On circ/circulation-home.pl and reserve/request.pl, search for patrons
The descriptions for the libraries and patron categories should be
displayed.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

On top of Bug 13336
Works as described, now descriptions instead of codes.
No errors

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

https://bugs.koha-community.org/show_bug.cgi?id=16455
---
 .../intranet-tmpl/prog/en/includes/circ-patron-search-results.inc     | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt           | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt            | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
index c60395b..cdd377c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
@@ -31,8 +31,8 @@
                     <td><a href="/cgi-bin/koha/reserve/request.pl?borrowernumber=[% borrower.borrowernumber %]&amp;biblionumber=[% biblionumber %]">[% borrower.surname %], [% borrower.firstname %]</a></td>
             [% END %]
                 <td>[% borrower.cardnumber %]</td>
-                <td>[% borrower.categorycode %]</td>
-                <td>[% borrower.branchcode %]</td>
+                <td>[% Categories.GetName( borrower.categorycode ) %]</td>
+                <td>[% Branches.GetName( borrower.branchcode ) %]</td>
                 <td>[% borrower.address %]</td>
             </tr>
         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 2cd368f..f8666bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -1,6 +1,7 @@
 [% USE Koha %]
 [% USE Branches %]
 [% USE KohaDates %]
+[% USE Categories %]
 [% USE ColumnsSettings %]
 [% USE ItemTypes %]
 [% USE Price %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index c2365b3..1f01a69 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -1,5 +1,7 @@
 [% USE Koha %]
 [% USE KohaDates %]
+[% USE Branches %]
+[% USE Categories %]
 [% USE ItemTypes %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% UNLESS ( multi_hold ) %]
-- 
2.1.4