Attachment 64211 Details for Bug 18789 – Bug 18789: Send Koha::Patron object to the templates

[patch] Bug 18789: Send Koha::Patron object to the templates

Bug-18789-Send-KohaPatron-object-to-the-templates.patch (text/plain), 219.30 KB, created by Jonathan Druart on 2017-06-12 16:59:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-06-12 16:59:20 UTC

Size: 219.30 KB

patch

obsolete

>From dce139f10b0b5bfb365da3b923c14e3dd701be5b Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 1 Jun 2017 14:47:40 -0300
>Subject: [PATCH] Bug 18789: Send Koha::Patron object to the templates
>
>In order to simplify and make uniform the code, the controller scripts send
>a Koha::Patron object to the templates instead of all attributes of a patron.
>
>That will make the code much more easier to maintain and will be less
>error-prone.
>
>The variable "patron" sent to the templates is supposed to represent the
>patron the librarian is editing the detail.
>
>In the members module and some scripts of the circulation module, the
>patron's detail are sent one by one to the template. That leads to
>frustration from developpers (making sure everything is passed from all
>scripts) and to regression (we got tone of bugs in the last year because
>of this way to do).
>With this patch set it will be easy access patron's detail, passing only
>1 variable from the controllers.
>
>Test plan:
>Play with the patron and circulation module and make sur the detail of
>the patron you are editing/seeing info are correctly displayed.
>---
> acqui/acqui-home.pl                                |   5 +-
> acqui/booksellers.pl                               |   3 +-
> admin/aqbudgets.pl                                 |   3 +-
> circ/branchtransfers.pl                            |   5 +-
> circ/overdue.pl                                    |  15 ---
> circ/transferstoreceive.pl                         |   8 +-
> circ/waitingreserves.pl                            |  10 +-
> .../prog/en/includes/borrower_debarments.inc       |   4 +-
> .../intranet-tmpl/prog/en/includes/circ-menu.inc   |  64 +++++------
> .../en/includes/member-alt-address-style-de.inc    |  22 ++--
> .../en/includes/member-alt-address-style-fr.inc    |  22 ++--
> .../en/includes/member-alt-address-style-us.inc    |  20 ++--
> .../en/includes/member-alt-contact-style-de.inc    |  18 +--
> .../en/includes/member-alt-contact-style-fr.inc    |  18 +--
> .../en/includes/member-alt-contact-style-us.inc    |  18 +--
> .../includes/member-display-address-style-de.inc   |  20 ++--
> .../includes/member-display-address-style-fr.inc   |  22 ++--
> .../includes/member-display-address-style-us.inc   |  20 ++--
> .../member-display-alt-address-style-de.inc        |  20 ++--
> .../member-display-alt-address-style-fr.inc        |  26 ++---
> .../member-display-alt-address-style-us.inc        |  20 ++--
> .../en/includes/member-main-address-style-de.inc   |  18 +--
> .../en/includes/member-main-address-style-fr.inc   |  18 +--
> .../en/includes/member-main-address-style-us.inc   |  18 +--
> .../prog/en/includes/members-toolbar.inc           |  42 +++----
> .../prog/en/modules/acqui/acqui-home.tt            |   4 +-
> .../prog/en/modules/acqui/booksellers.tt           |   6 +-
> .../prog/en/modules/admin/aqbudgets.tt             |   8 +-
> .../prog/en/modules/circ/branchtransfers.tt        |   6 +-
> .../prog/en/modules/circ/printslip.tt              |   2 +-
> .../prog/en/modules/circ/transferstoreceive.tt     |  14 +--
> .../prog/en/modules/circ/waitingreserves.tt        |  14 +--
> .../prog/en/modules/members/boraccount.tt          |  10 +-
> .../prog/en/modules/members/deletemem.tt           |  14 +--
> .../prog/en/modules/members/discharge.tt           |   8 +-
> .../prog/en/modules/members/housebound.tt          |  16 +--
> .../prog/en/modules/members/mancredit.tt           |  12 +-
> .../prog/en/modules/members/maninvoice.tt          |  12 +-
> .../prog/en/modules/members/member-flags.tt        |  10 +-
> .../prog/en/modules/members/member-password.tt     |  16 +--
> .../prog/en/modules/members/memberentrygen.tt      |   2 +-
> .../prog/en/modules/members/moremember-print.tt    |  20 ++--
> .../prog/en/modules/members/moremember.tt          | 124 ++++++++++-----------
> .../intranet-tmpl/prog/en/modules/members/pay.tt   |  18 +--
> .../prog/en/modules/members/paycollect.tt          |  24 ++--
> .../prog/en/modules/members/printfeercpt.tt        |   9 +-
> .../prog/en/modules/members/printinvoice.tt        |   9 +-
> .../en/modules/members/purchase-suggestions.tt     |   2 +-
> .../prog/en/modules/members/readingrec.tt          |   4 +-
> .../prog/en/modules/members/routing-lists.tt       |   4 +-
> .../prog/en/modules/members/statistics.tt          |   4 +-
> .../prog/en/modules/reserve/request.tt             |  50 ++++-----
> .../prog/en/modules/reviews/reviewswaiting.tt      |   2 +-
> .../intranet-tmpl/prog/en/modules/tools/viewlog.tt |  12 +-
> .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |  10 +-
> members/boraccount.pl                              |   4 +-
> members/deletemem.pl                               |  18 +--
> members/discharge.pl                               |  26 +----
> members/files.pl                                   |   3 +-
> members/housebound.pl                              |   7 +-
> members/mancredit.pl                               |   4 +-
> members/maninvoice.pl                              |   5 +-
> members/member-flags.pl                            |  22 +---
> members/member-password.pl                         |  24 +---
> members/moremember.pl                              |  15 +--
> members/notices.pl                                 |   4 +-
> members/pay.pl                                     |  13 +--
> members/paycollect.pl                              |   5 +-
> members/printfeercpt.pl                            |  26 +----
> members/printinvoice.pl                            |  25 +----
> members/purchase-suggestions.pl                    |   8 +-
> members/readingrec.pl                              |  35 ++----
> members/routing-lists.pl                           |  15 +--
> members/statistics.pl                              |  14 +--
> members/summary-print.pl                           |   9 +-
> opac/opac-detail.pl                                |   9 +-
> opac/opac-reserve.pl                               |   4 -
> reserve/request.pl                                 |  22 +---
> reviews/reviewswaiting.pl                          |   4 +-
> tools/viewlog.pl                                   |  10 +-
> 80 files changed, 494 insertions(+), 742 deletions(-)
>
>diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
>index 4da1eaf2dc..2552909d6a 100755
>--- a/acqui/acqui-home.pl
>+++ b/acqui/acqui-home.pl
>@@ -73,10 +73,7 @@ foreach my $budget ( @{$budget_arr} ) {
> 
>     my $patron = Koha::Patrons->find( $budget->{budget_owner_id} );
>     if ( $patron ) {
>-        # FIXME should pass the entire object into budget_owner
>-        $budget->{budget_owner_firstname} = $patron->firstname;
>-        $budget->{budget_owner_surname} = $patron->surname;
>-        $budget->{budget_owner_borrowernumber} = $patron->borrowernumber;
>+        $budget->{budget_owner} = $patron;
>     }
> 
>     if ( !defined $budget->{budget_amount} ) {
>diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
>index 797170166d..7d564ab129 100755
>--- a/acqui/booksellers.pl
>+++ b/acqui/booksellers.pl
>@@ -137,8 +137,7 @@ for my $vendor (@suppliers) {
>                 $basket->{$_} ||= 0;
>             }
>             if ( $patron ) {
>-                $basket->{authorisedby_firstname} = $patron->firstname;
>-                $basket->{authorisedby_surname} = $patron->surname;
>+                $basket->{authorisedby} = $patron;
>             }
>             if ($basket->{basketgroupid}) {
>                 my $basketgroup = C4::Acquisition::GetBasketgroup($basket->{basketgroupid});
>diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
>index 0dce9ddd89..aed2e6c4e3 100755
>--- a/admin/aqbudgets.pl
>+++ b/admin/aqbudgets.pl
>@@ -115,8 +115,7 @@ if ($op eq 'add_form') {
>             exit;
>         }
>         $dropbox_disabled = BudgetHasChildren($budget_id);
>-        my $patron = Koha::Patrons->find( $budget->{budget_owner_id} );
>-        $budget->{budget_owner_name} = ( $patron ? $patron->firstname . ' ' . $patron->surname : '' );
>+        $budget->{budget_owner} = Koha::Patrons->find( $budget->{budget_owner_id} );
>     }
> 
>     # build budget hierarchy
>diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl
>index 600d70571e..3cded9bc07 100755
>--- a/circ/branchtransfers.pl
>+++ b/circ/branchtransfers.pl
>@@ -206,10 +206,7 @@ foreach my $code ( keys %$messages ) {
>             $err{borrowernumber} = $messages->{'WasReturned'};
>             my $patron = Koha::Patrons->find( $messages->{'WasReturned'} );
>             if ( $patron ) { # Just in case...
>-                $err{title}      = $patron->title;
>-                $err{firstname}  = $patron->firstname;
>-                $err{surname}    = $patron->surname;
>-                $err{cardnumber} = $patron->cardnumber;
>+                $err{patron} = $patron;
>             }
>         }
>         $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
>diff --git a/circ/overdue.pl b/circ/overdue.pl
>index 6691a82aa2..598a4a8855 100755
>--- a/circ/overdue.pl
>+++ b/circ/overdue.pl
>@@ -301,27 +301,12 @@ if ($noreport) {
>         push @overduedata, {
>             patron                 => scalar Koha::Patrons->find( $data->{borrowernumber} ),
>             duedate                => output_pref($dt),
>-            borrowernumber         => $data->{borrowernumber},
>             barcode                => $data->{barcode},
>-            cardnumber             => $data->{cardnumber},
>             itemnum                => $data->{itemnumber},
>             issuedate              => output_pref({ dt => dt_from_string( $data->{issuedate} ), dateonly => 1 }),
>-            borrowertitle          => $data->{borrowertitle},
>-            surname                => $data->{surname},
>-            firstname              => $data->{firstname},
>-            streetnumber           => $data->{streetnumber},                   
>-            streettype             => $data->{streettype},                     
>-            address                => $data->{address},                        
>-            address2               => $data->{address2},                       
>-            city                   => $data->{city},                   
>-            zipcode                => $data->{zipcode},                        
>-            country                => $data->{country},
>-            phone                  => $data->{phone},
>-            email                  => $data->{email},
>             biblionumber           => $data->{biblionumber},
>             title                  => $data->{title},
>             author                 => $data->{author},
>-            branchcode             => $data->{branchcode},
>             homebranchcode         => $data->{homebranchcode},
>             holdingbranchcode      => $data->{holdingbranchcode},
>             itemcallnumber         => $data->{itemcallnumber},
>diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
>index b769f50f74..fb603d463c 100755
>--- a/circ/transferstoreceive.pl
>+++ b/circ/transferstoreceive.pl
>@@ -105,13 +105,7 @@ while ( my $library = $libraries->next ) {
>             my $item = Koha::Items->find( $num->{itemnumber} );
>             my $holds = $item->current_holds;
>             if ( my $first_hold = $holds->next ) {
>-                my $patron = Koha::Patrons->find( $first_hold->borrowernumber );
>-                # FIXME The full patron object should be passed to the template
>-                $getransf{'borrowernum'}       = $patron->borrowernumber;
>-                $getransf{'borrowername'}      = $patron->surname;
>-                $getransf{'borrowerfirstname'} = $patron->firstname;
>-                $getransf{'borrowermail'}      = $patron->email if $patron->email;
>-                $getransf{'borrowerphone'}     = $patron->phone;
>+                $getransf{patron} = Koha::Patrons->find( $first_hold->borrowernumber );
>             }
>             push( @transferloop, \%getransf );
>         }
>diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
>index 2231ff80d7..0a31a98e2f 100755
>--- a/circ/waitingreserves.pl
>+++ b/circ/waitingreserves.pl
>@@ -123,15 +123,7 @@ foreach my $num (@getreserves) {
>     if ( $homebranch ne $holdingbranch ) {
>         $getreserv{'dotransfer'} = 1;
>     }
>-    $getreserv{'borrowername'}      = $patron->surname;
>-    $getreserv{'borrowerfirstname'} = $patron->firstname;
>-    $getreserv{'borrowerphone'}     = $patron->phone;
>-
>-    my $borEmail = GetFirstValidEmailAddress( $borrowernum );
>-
>-    if ( $borEmail ) {
>-        $getreserv{'borrowermail'}  = $borEmail;
>-    }
>+    $getreserv{patron} = $patron;
> 
>     if ($today > $calcDate) {
>         if ($cancelall) {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
>index 9440c62db0..51bce73348 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
>@@ -66,7 +66,7 @@
>                         <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
>                         [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
>                             <td>
>-                                <a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del">
>+                                <a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% patron.borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del">
>                                     <i class="fa fa-trash"></i> Remove
>                                 </a>
>                             </td>
>@@ -79,7 +79,7 @@
>     [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
>         <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
>         <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
>-            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>+            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>             <input type="hidden" name="action" value="add" />
>             <fieldset class="rows" id="manual_restriction_form">
>                 <legend>Add manual restriction</legend>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>index dcc8eea088..c54ba30806 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>@@ -1,5 +1,5 @@
> [% USE Koha %]
>-[% IF ( borrowernumber ) %]
>+[% IF ( patron.borrowernumber ) %]
> <div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
> 
> <div class="statictabs">
> <ul>
>-    <li class="active"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
>-	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
>-	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create manual invoice</a></li>
>-	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create manual credit</a></li>
>+    <li class="active"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
>+    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
>+    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
>+    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
> </ul>
> <div class="tabs-container">
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
>index 82ba917c06..43911efa7c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
>@@ -1,12 +1,12 @@
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Delete patron [% firstname %] [% surname %]</title>
>+<title>Koha &rsaquo; Delete patron [% patron.firstname %] [% patron.surname %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="pat_deletemem" class="pat">
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'patron-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo; Delete patron [% firstname %] [% surname %]</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo; Delete patron [% patron.firstname %] [% patron.surname %]</div>
> <div id="doc3" class="yui-t2">
>    
>    <div id="bd">
>@@ -28,18 +28,18 @@
>             [% END %]
>             </ul>
>     </div>
>-    [% ELSIF op == 'delete_confirm' and borrowernumber %]
>-        [%# TODO add "patron does not exist" unless borrowernumber %]
>+    [% ELSIF op == 'delete_confirm' and patron %]
>+        [%# TODO add "patron does not exist" unless patron %]
>         <div class="dialog alert">
>-            <h3>Are you sure you want to delete the patron [% firstname %] [% surname %]? This cannot be undone.</h3>
>+            <h3>Are you sure you want to delete the patron [% patron.firstname %] [% patron.surname %]? This cannot be undone.</h3>
>             <form action="/cgi-bin/koha/members/deletemem.pl">
>                 <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
>-                <input type="hidden" name="member" value="[% borrowernumber %]"/>
>+                <input type="hidden" name="member" value="[% patron.borrowernumber %]"/>
>                 <input type="hidden" name="op" value="delete_confirmed" />
>                 <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>             </form>
>             <form action="/cgi-bin/koha/members/moremember.pl">
>-                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]"/>
>+                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]"/>
>                 <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>             </form>
>         </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
>index 8e316cc32f..f352405ea7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
>@@ -2,7 +2,7 @@
> [% USE AuthorisedValues %]
> [% USE Branches %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Patrons &rsaquo; [% UNLESS blocking_error  %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %]</title>
>+<title>Koha &rsaquo; Patrons &rsaquo; [% UNLESS blocking_error  %]Discharge for [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="discharge" class="discharge">
>@@ -12,7 +12,7 @@
> <div id="breadcrumbs">
>          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
>-&rsaquo; [% UNLESS blocking_error  %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %]
>+&rsaquo; [% UNLESS blocking_error  %]Discharge for [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])[% END %]
> </div>
> 
> <div id="doc3" class="yui-t1">
>@@ -32,12 +32,12 @@
> [% UNLESS can_be_discharged %]
>     <p>Cannot edit discharge: the patron has checked out items.</p>
> [% ELSE %]
>-    [% IF has_reserves %]
>+    [% IF patron.holds.count %]
>         <p>Borrower has reserves: they will be canceled if the discharge is generated.</p>
>     [% END %]
>     <form method="post">
>         <input type="submit" value="Generate discharge" name="discharge" />
>-        <input type="hidden" value="[% borrowernumber %]" name="borrowernumber" />
>+        <input type="hidden" value="[% patron.borrowernumber %]" name="borrowernumber" />
>     </form>
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>index 3dac61fd1f..636e3b3638 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>@@ -65,7 +65,7 @@
>               <h4>Manage housebound profile</h4>
>               <form id="editform" method="post" name="editform"
>                     action="/cgi-bin/koha/members/housebound.pl">
>-                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>+                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>                 [% IF ( housebound_profile ) %]
>                   <input type="hidden" name="method" value="updateconfirm" />
>                 [% ELSE %]
>@@ -196,7 +196,7 @@
>                 <fieldset class="action">
>                   <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save changes</button>
>                   <a class="cancel btn btn-link btn-sm"
>-                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">
>+                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">
>                     Cancel
>                   </a>
>                 </fieldset>
>@@ -213,7 +213,7 @@
>                 [% ELSE %]
>                   <input type="hidden" name="method" value="addvisitconfirm" />
>                 [% END %]
>-                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>+                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>                 <fieldset class="rows" id="instance">
>                   <legend>Delivery details</legend>
>                   <ol>
>@@ -322,7 +322,7 @@
>                 <fieldset class="action">
>                   <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</button>
>                   <a class="cancel"
>-                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">
>+                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">
>                     Cancel
>                   </a>
>                 </fieldset>
>@@ -379,7 +379,7 @@
>                   </li>
>                 </ol>
>                 <div class="action">
>-                  <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]&method=update_or_create"><i class="fa fa-pencil"></i> Edit</a>
>+                  <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]&method=update_or_create"><i class="fa fa-pencil"></i> Edit</a>
>                 </div>
>               </div>
>               <div>
>@@ -405,15 +405,15 @@
>                         </a>
>                       </td>
>                       <td class="actions">
>-                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&visit_id=[% entry.id %]&borrowernumber=[% borrowernumber %]"><i class="fa fa-pencil"></i> Edit</a>
>-                        <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_delete&visit_id=[% entry.id %]&borrowernumber=[% borrowernumber %]"><i class="fa fa-trash"></i> Delete</a>
>+                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&visit_id=[% entry.id %]&borrowernumber=[% patron.borrowernumber %]"><i class="fa fa-pencil"></i> Edit</a>
>+                        <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_delete&visit_id=[% entry.id %]&borrowernumber=[% patron.borrowernumber %]"><i class="fa fa-trash"></i> Delete</a>
>                       </td>
>                     </tr>
>                     [% END %]
>                 </table>
>                 [% END %]
>                 <div class="action">
>-                  <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% borrowernumber %]"
>+                  <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% patron.borrowernumber %]"
>                     class="btn btn-default btn-sm">
>                     <i class="fa fa-plus"></i> Add a new delivery
>                   </a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>index 65a61a59ea..0320fe6471 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>@@ -27,15 +27,15 @@ $(document).ready(function(){
> 
> <div class="statictabs">
> <ul>
>-	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
>-	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
>-	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create manual invoice</a></li>
>-    <li class="active"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create manual credit</a></li>
>+    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
>+    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
>+    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
>+    <li class="active"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
> </ul>
> <div class="tabs-container">
> 
> <form action="/cgi-bin/koha/members/mancredit.pl" method="post" id="mancredit">
>-<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
>+<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
> 
> <fieldset class="rows">
> <legend>Manual credit</legend><ol>
>@@ -49,7 +49,7 @@ $(document).ready(function(){
>     <li><label for="amount">Amount: </label><input type="number" name="amount" id="amount" required="required" value="" step="any" min="0" /> Example: 5.00</li>
> </ol></fieldset>
> 
>-<fieldset class="action"><input type="submit" name="add" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>
>+<fieldset class="action"><input type="submit" name="add" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></fieldset>
> </form>
> 
> </div></div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>index 8fc1f68a59..b2c16b573e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>@@ -35,10 +35,10 @@ $(document).ready(function(){
> 
> <div class="statictabs">
> <ul>
>-	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
>-	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
>-    <li class="active"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create manual invoice</a></li>
>-	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create manual credit</a></li>
>+    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
>+    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
>+    <li class="active"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
>+    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
> </ul>
> <div class="tabs-container">
> 
>@@ -47,7 +47,7 @@ $(document).ready(function(){
>   ERROR an invalid itemnumber was entered, please hit back and try again
> [% END %]
> [% ELSE %]
>-<form action="/cgi-bin/koha/members/maninvoice.pl" method="post" id="maninvoice"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
>+<form action="/cgi-bin/koha/members/maninvoice.pl" method="post" id="maninvoice"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
> 	<fieldset class="rows">
> 	<legend>Manual invoice</legend>
> 	<ol>
>@@ -69,7 +69,7 @@ $(document).ready(function(){
>     <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
>     <li><label for="amount">Amount: </label><input type="number" name="amount" id="amount" required="required" value="" step="any" min="0" /> Example: 5.00</li>
> 	</ol></fieldset>
>-<fieldset class="action"><input type="submit" name="add" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>
>+<fieldset class="action"><input type="submit" name="add" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></fieldset>
> </form>
> 
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>index 524c0a1cd6..f15a09206d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>@@ -1,7 +1,7 @@
> [% USE Branches %]
> [% PROCESS 'permissions.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Patrons &rsaquo; Set permissions for [% surname %], [% firstname %]</title>
>+<title>Koha &rsaquo; Patrons &rsaquo; Set permissions for [% patron.surname %], [% patron.firstname %]</title>
> <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/treeview/jquery.treeview.css"/>
> [% INCLUDE 'doc-head-close.inc' %]
> <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.treeview.pack.js"></script>
>@@ -112,7 +112,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'patron-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Set permissions for [% surname %], [% firstname %]</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Set permissions for [% patron.surname %], [% patron.firstname %]</div>
> 
> <div id="doc3" class="yui-t2">
>    
>@@ -123,9 +123,9 @@
> 
> <form method="post" action="/cgi-bin/koha/members/member-flags.pl">
>     <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
>-    <input type="hidden" name="member" id="borrowernumber" value="[% borrowernumber %]" />
>+    <input type="hidden" name="member" id="borrowernumber" value="[% patron.borrowernumber %]" />
>     <input type="hidden" name="newflags" value="1" />
>-    <h1>Set permissions for [% surname %], [% firstname %]</h1>
>+    <h1>Set permissions for [% patron.surname %], [% patron.firstname %]</h1>
>     
>     <ul id="permissionstree" class="treeview-grey">
>         
>@@ -165,7 +165,7 @@
>     
>     </ul>
> 
>-<fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>
>+<fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></fieldset>
> 
> </form>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
>index 2c28996a59..6580df178f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
>@@ -1,6 +1,6 @@
> [% USE Branches %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% surname %], [% firstname %][% END %]</title>
>+<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% patron.surname %], [% patron.firstname %][% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <script type="text/JavaScript">
> //<![CDATA[
>@@ -29,7 +29,7 @@
>         });
>         $("body").on('click', "#fillrandom",function(e) {
>             e.preventDefault();
>-            $.get("/cgi-bin/koha/members/member-password.pl?member=[% userid %]", function(response) {
>+            $.get("/cgi-bin/koha/members/member-password.pl?member=[% patron.userid %]", function(response) {
>                 var defaultnewpass = $(response).find("#defaultnewpassfield").val();
>                 $("#newpassword").after("<input type=\"text\" name=\"newpassword\"  id=\"newpassword\" value=\"" + defaultnewpass + "\">").remove();
>                 $("#newpassword2").after("<input type=\"text\" name=\"newpassword2\" id=\"newpassword2\" value=\"" + defaultnewpass + "\">").remove();
>@@ -55,7 +55,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'patron-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% firstname %] [% surname %]</a> &rsaquo; [% IF ( newpassword ) %]Password Updated[% ELSE %]Change username and/or password[% END %]</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a> &rsaquo; [% IF ( newpassword ) %]Password Updated[% ELSE %]Change username and/or password[% END %]</div>
> 
> <div id="doc3" class="yui-t2">
> 
>@@ -71,8 +71,8 @@
> 
> <form method="post" id="changepasswordf" action="/cgi-bin/koha/members/member-password.pl">
> <input type="hidden" name="destination" value="[% destination %]" />
>-<input type="hidden" name="cardnumber" value="[% cardnumber %]" />
>-<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
>+<input type="hidden" name="cardnumber" value="[% patron.cardnumber %]" />
>+<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
> 	[% IF ( errormsg ) %]
> 		<div class="dialog alert">
> 		<h4>The following errors have occurred:</h4>
>@@ -94,10 +94,10 @@
> 	[% END %]
> 
> 
>-    <fieldset class="brief"><legend>Change username and/or password for [% firstname %] [% surname %]</legend>
>+    <fieldset class="brief"><legend>Change username and/or password for [% patron.firstname %] [% patron.surname %]</legend>
> 	<ol>
>     <li><label for="newuserid">New username:</label>
>-	<input type="hidden" name="member" value="[% borrowernumber %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% userid %]" /></li>
>+    <input type="hidden" name="member" value="[% patron.borrowernumber %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid %]" /></li>
>     <li><label for="newpassword">New password:</label>
>     <div class="hint">Koha cannot display existing passwords. Leave the field blank to leave password unchanged.</div>
> 	[% IF ( minPasswordLength ) %]<div class="hint">Minimum password length: [% minPasswordLength %]</div>[% END %]
>@@ -118,7 +118,7 @@
>     <fieldset class="action">
>         <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
>         <input type="submit" value="Save" />
>-        <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a>
>+        <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a>
>     </fieldset>
> </form>[% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index 513eedecc2..d238252212 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -2,7 +2,7 @@
> [% USE KohaDates %]
> [% USE Branches %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</title>
>+<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF patron %][% patron.category.description %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
> [% INCLUDE 'calendar.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>index 567b18dd3e..8e29b97e5c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>@@ -3,13 +3,13 @@
> [% USE KohaDates %]
> [% USE Price %]
> [% INCLUDE 'doc-head-open.inc' %]
>-    <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
>+    <title>Summary for [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])</title>
>     [% INCLUDE 'doc-head-close.inc' %]
>     [% INCLUDE 'slip-print.inc' #printThenClose %]
> </head>
> <body id="pat_moremember-print" class="pat">
>     <div id="main">
>-        <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>
>+        <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% patron.cardnumber %]">Account summary: [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])</a></h3>
> 
>         <ul>
>             [% IF Koha.Preference( 'AddressFormat' ) %]
>@@ -17,15 +17,15 @@
>             [% ELSE %]
>                 [% INCLUDE 'member-display-address-style-us.inc' %]
>             [% END %]
>-            <li>[% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]</li>
>-            <li>[% IF ( email ) %][% email %][% ELSE %](no primary email on file)[% END %]</li>
>-            [% IF ( emailpro ) %]
>-                <li>[% emailpro %]</li>
>+            <li>[% IF ( patron.phone ) %][% patron.phone %][% ELSE %](no phone number on file)[% END %]</li>
>+            <li>[% IF ( patron.email ) %][% patron.email %][% ELSE %](no primary email on file)[% END %]</li>
>+            [% IF ( patron.emailpro ) %]
>+                <li>[% patron.emailpro %]</li>
>             [% END %]
>-            <li>Registration date: [% dateenrolled | $KohaDates %]</li>
>-            <li>Expiration date: [% dateexpiry | $KohaDates %]</li>
>-            <li>Library: [% Branches.GetName( branchcode ) %]</li>
>-            <li>Category: [% description %]</li>
>+            <li>Registration date: [% patron.dateenrolled | $KohaDates %]</li>
>+            <li>Expiration date: [% patron.dateexpiry | $KohaDates %]</li>
>+            <li>Library: [% Branches.GetName( patron.branchcode ) %]</li>
>+            <li>Category: [% patron.category.description %]</li>
>         </ul>
> 
>         [% IF ( issues ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index 1a25f74e31..e57364c8d8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -27,7 +27,7 @@
> /* Set some variable needed in circulation.js */
> var interface = "[% interface %]";
> var theme = "[% theme %]";
>-var borrowernumber = "[% borrowernumber %]";
>+var borrowernumber = "[% patron.borrowernumber %]";
> var branchcode = "[% Branches.GetLoggedInBranchcode() %]";
> var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
> var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %]
>@@ -46,7 +46,7 @@ $(document).ready(function() {
>     if ( $('#clubs-tab').length ) {
>         $('#clubs-tab-link').on('click', function() {
>             $('#clubs-tab').text(_("Loading..."));
>-            $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]');
>+            $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% patron.borrowernumber %]');
>         });
>     }
> 
>@@ -174,7 +174,7 @@ function validate1(date) {
> [% END %]
> <div class="yui-g">
> 
>-    [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry | $KohaDates %]</div>[% END %]
>+    [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% patron.dateexpiry | $KohaDates %]</div>[% END %]
> 
>     [% IF fines %]
>     <div id="circmessages" class="circmessage attention">
>@@ -205,18 +205,18 @@ function validate1(date) {
>                 <a href="#reldebarments" id="view_restrictions">View restrictions</a>
>             </li>
>         [% END %]
>-        [% IF ( gonenoaddress ) %]<li class="blocker">Patron's address is in doubt.</li>[% END %]
>+        [% IF ( patron.gonenoaddress ) %]<li class="blocker">Patron's address is in doubt.</li>[% END %]
>         [% IF ( lost ) %]<li class="blocker">Patron's card has been reported lost.</li>[% END %]
>         </ul>
>     </div>
>     [% END %]
> 
> <h3>[% UNLESS ( I ) %]
>-   [% title | html %] [% firstname | html %] [% END %] [% surname | html %] ([% cardnumber | html %])</h3>
>+   [% patron.title | html %] [% patron.firstname | html %] [% END %] [% patron.surname | html %] ([% patron.cardnumber | html %])</h3>
>  <div class="yui-u first">
> <div id="patron-information" style="padding : .5em;">
> 
>-     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames | html %]&rdquo;[% END %]
>+     [% UNLESS ( I ) %][% IF ( patron.othernames ) %]&ldquo;[% patron.othernames | html %]&rdquo;[% END %]
> 
>     <div class = "address">
>         [% IF Koha.Preference( 'AddressFormat' ) %]
>@@ -229,23 +229,23 @@ function validate1(date) {
> 	<div class="rows">
> 		<ol>
>         [% IF ( I ) %]
>-            [% IF ( phonepro ) %]<li><span class="label">Organization phone: </span><a href="tel:[% phonepro %]">[% phonepro | html %]</a></li>[% END %]
>-            [% IF ( emailpro ) %]<li class="email"><span class="label">Organization email: </span>[% emailpro | html %]</li>[% END %]
>+            [% IF ( patron.phonepro ) %]<li><span class="label">Organization phone: </span><a href="tel:[% patron.phonepro %]">[% patron.phonepro | html %]</a></li>[% END %]
>+            [% IF ( patron.emailpro ) %]<li class="email"><span class="label">Organization email: </span>[% patron.emailpro | html %]</li>[% END %]
>         [% ELSE %]
>-            [% IF ( phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% phone %]">[% phone | html %]</a></li>[% END %]
>-            [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% phonepro %]">[% phonepro | html %]</a></li>[% END %]
>-            [% IF ( mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% mobile %]">[% mobile | html %]</a></li>[% END %]
>+            [% IF ( patron.phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% patron.phone %]">[% patron.phone | html %]</a></li>[% END %]
>+            [% IF ( patron.phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% patron.phonepro %]">[% patron.phonepro | html %]</a></li>[% END %]
>+            [% IF ( patron.mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% patron.mobile %]">[% patron.mobile | html %]</a></li>[% END %]
>         [% END %]
> 
>-	[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
>+    [% IF ( patron.fax ) %]<li><span class="label">Fax: </span>[% patron.fax %]</li>[% END %]
>     [% UNLESS ( I ) %]
>-        [% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a title="[% email %]" href="mailto:[% email | url %]">[% email | html %]</a></li>[% END %]
>-        [% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a title="[% emailpro %]" href="mailto:[% emailpro | url %]">[% emailpro | html %]</a></li>[% END %]
>+        [% IF ( patron.email ) %]<li class="email"><span class="label">Primary email:</span><a title="[% patron.email %]" href="mailto:[% patron.email | url %]">[% patron.email | html %]</a></li>[% END %]
>+        [% IF ( patron.emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a title="[% patron.emailpro %]" href="mailto:[% patron.emailpro | url %]">[% patron.emailpro | html %]</a></li>[% END %]
>     [% END %]
>-    [% IF ( initials ) %]<li><span class="label">Initials: </span>[% initials %]</li>[% END %]
>-    [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth | $KohaDates %] ([% age %] years)</li>[% END %]
>-    [% IF ( sex ) %]<li><span class="label">Gender:</span>
>-    [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
>+    [% IF ( patron.initials ) %]<li><span class="label">Initials: </span>[% patron.initials %]</li>[% END %]
>+    [% IF ( patron.dateofbirth ) %]<li><span class="label">Date of birth:</span>[% patron.dateofbirth | $KohaDates %] ([% age %] years)</li>[% END %]
>+    [% IF ( patron.sex ) %]<li><span class="label">Gender:</span>
>+    [% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSE %][% patron.sex %][% END %]
>     </li>[% END %][% END %]
>     [% IF guarantees %]
>         <li>
>@@ -274,9 +274,9 @@ function validate1(date) {
> </div>
>       <div class="action">
>         [% IF ( guarantor.borrowernumber ) %]
>-        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=1&amp;guarantorid=[% guarantor.borrowernumber %]">Edit</a>
>+        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=1&amp;guarantorid=[% guarantor.borrowernumber %]">Edit</a>
>         [% ELSE %]
>-        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=1">Edit</a>
>+        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=1">Edit</a>
>         [% END %]</div>
> 
> </div>
>@@ -290,16 +290,16 @@ function validate1(date) {
>             <fieldset class="brief">
>             [% IF ( picture ) %]
>                 <legend>Manage patron image</legend>
>-                <div class="hint">To update the image for [% title | html %] [% surname | html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.
>+                <div class="hint">To update the image for [% patron.title | html %] [% patron.surname | html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.
>             [% ELSE %]
>                 <legend>Upload patron image</legend>
>-                <div class="hint">[% title %] [% firstname | html %] [% surname | html %] does not currently have an image available. To import an image for [% title %] [% surname | html %], enter the name of an image file to upload.
>+                <div class="hint">[% patron.title %] [% patron.firstname | html %] [% patron.surname | html %] does not currently have an image available. To import an image for [% patron.title %] [% patron.surname | html %], enter the name of an image file to upload.
>             [% END %]
>                     <br />Only PNG, GIF, JPEG, XPM formats are supported.
>                 </div>
>                 <input type="hidden" id="image" name="filetype" value="image" />
>-                <input type="hidden" id="cardnumber" name="cardnumber" value="[% cardnumber | html %]" />
>-                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>+                <input type="hidden" id="cardnumber" name="cardnumber" value="[% patron.cardnumber | html %]" />
>+                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>                 <ol>
>                     <li>
>                        <label for="uploadfile">Select the file to upload: </label><input type="file" id="uploadfile" name="uploadfile" />
>@@ -309,7 +309,7 @@ function validate1(date) {
>                     <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
>                     <input type="submit" value="Upload" class="submit" />
>                     <input name="op" type="hidden" value="Upload" />
>-                    [% IF ( picture ) %]<a id="delpicture" href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&amp;borrowernumber=[% borrowernumber %]&amp;csrf_token=[% csrf_token %]" class="delete">Delete</a>[% END %]
>+                    [% IF ( picture ) %]<a id="delpicture" href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&amp;borrowernumber=[% patron.borrowernumber %]&amp;csrf_token=[% csrf_token %]" class="delete">Delete</a>[% END %]
>                 </fieldset>
>             </fieldset>
>         </form>
>@@ -343,7 +343,7 @@ function validate1(date) {
>   </ol>
> </div>
> </div>
>-<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=4">Edit</a></div>
>+<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=4">Edit</a></div>
> [% END %]
> 
> [% IF ( ExtendedPatronAttributes ) %]
>@@ -372,7 +372,7 @@ function validate1(date) {
>     </div>
> [% END %]
> </div>
>-<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=4">Edit</a></div>
>+<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=4">Edit</a></div>
> [% END %]
> [% END %]
> 
>@@ -382,11 +382,11 @@ function validate1(date) {
> <h3>Patron messaging preferences</h3>
> [% INCLUDE 'messaging-preference-form.inc' %]
>  [% IF ( SMSSendDriver ) %]
>-      <div class="rows"> <ol><li><span class="label">SMS number:</span><a href="sms:[% SMSnumber %]">[% SMSnumber %]</a>
>+      <div class="rows"> <ol><li><span class="label">SMS number:</span><a href="sms:[% patron.smsalertnumber %]">[% patron.smsalertnumber %]</a>
>      </li></ol></div>
>  [% END %]
> </div>
>-<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=5">Edit</a></div>
>+<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=5">Edit</a></div>
> [% END %]
> 
> </div>
>@@ -395,16 +395,16 @@ function validate1(date) {
>  <h3>Library use</h3>
> <div class="rows"> 
> <ol>
>-    <li><span class="label">Card number: </span>[% cardnumber %]</li>
>-	<li><span class="label">Borrowernumber: </span> [% borrowernumber %]</li>
>-    <li><span class="label">Category: </span>[% description %] ([% categorycode %])</li>
>-    <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
>+    <li><span class="label">Card number: </span>[% patron.cardnumber %]</li>
>+	<li><span class="label">Borrowernumber: </span> [% patron.borrowernumber %]</li>
>+    <li><span class="label">Category: </span>[% patron.category.description %] ([% patron.categorycode %])</li>
>+    <li><span class="label">Registration date: </span>[% patron.dateenrolled | $KohaDates %]</li>
>     
>     <li><span class="label">Expiration date: </span>
>     [% IF ( was_renewed ) %]
>-            <strong class="reregistrinfo">[% dateexpiry | $KohaDates %]</strong>
>+            <strong class="reregistrinfo">[% patron.dateexpiry | $KohaDates %]</strong>
>     [% ELSE %]
>-            [% dateexpiry | $KohaDates %]
>+            [% patron.dateexpiry | $KohaDates %]
>     [% END %]
>     </li>
>     
>@@ -425,18 +425,18 @@ function validate1(date) {
>         [% END %]
>     </li>
> 
>-    [% IF ( sort1 ) %]<li><span class="label">Sort field 1:</span>[% AuthorisedValues.GetByCode('Bsort1', sort1) %]</li>[% END %]
>-    [% IF ( sort2 ) %]<li><span class="label">Sort field 2:</span>[% AuthorisedValues.GetByCode('Bsort2', sort2) %]</li>[% END %]
>-    <li><span class="label">Username: </span>[% userid %]</li>
>+    [% IF ( patron.sort1 ) %]<li><span class="label">Sort field 1:</span>[% AuthorisedValues.GetByCode('Bsort1', patron.sort1) %]</li>[% END %]
>+    [% IF ( patron.sort2 ) %]<li><span class="label">Sort field 2:</span>[% AuthorisedValues.GetByCode('Bsort2', patron.sort2) %]</li>[% END %]
>+    <li><span class="label">Username: </span>[% patron.userid %]</li>
>     <li><span class="label">Password: </span>
>-    [% IF ( password ) %]
>+    [% IF ( patron.password ) %]
>         *******
>     [% ELSE %]
>-        <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Undefined</a></span>
>+        <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber %]">Undefined</a></span>
>     [% END %] 
>     </li>
>-    [% IF ( borrowernotes ) %]<li><span class="label">Circulation note: </span>[% borrowernotes %]</li>[% END %]
>-    [% IF ( opacnote ) %]<li><span class="label">OPAC note:</span>[% opacnote %]</li>[% END %]
>+    [% IF ( patron.borrowernotes ) %]<li><span class="label">Circulation note: </span>[% patron.borrowernotes %]</li>[% END %]
>+    [% IF ( patron.opacnote ) %]<li><span class="label">OPAC note:</span>[% patron.opacnote %]</li>[% END %]
>     [% IF Koha.Preference( 'NorwegianPatronDBEnable' ) == 1 %]
>         [% IF ( sync == 1 ) %]
>             <li><span class="label">Activate sync: </span>Yes</li>
>@@ -448,9 +448,9 @@ function validate1(date) {
>     [% END %]
>     [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
>       <li><span class="label">Check previous checkouts: </span>
>-        [% IF ( checkprevcheckout == 'yes' ) %]
>+        [% IF ( patron.checkprevcheckout == 'yes' ) %]
>         Yes
>-        [% ELSIF ( checkprevcheckout == 'no' ) %]
>+        [% ELSIF ( patron.checkprevcheckout == 'no' ) %]
>         No
>         [% ELSE %]
>         Inherited
>@@ -460,13 +460,13 @@ function validate1(date) {
>     [% IF Koha.Preference('TranslateNotices') %]
>         <li>
>             <span class="label">Preferred language for notices: </span>
>-            [% translated_language %]
>+            [% patron.translated_language %]
>         </li>
>     [% END %]
> 	</ol>
> 	</div>
>  </div>
>-    <div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=3">Edit</a></div>
>+    <div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=3">Edit</a></div>
>  
>     [% UNLESS ( I ) %]
>  <div id="patron-alternate-address" style="padding-top: 1em;">
>@@ -479,29 +479,29 @@ function validate1(date) {
>     [% END %]
> 
>     <div class="rows">  <ol>
>-      [% IF ( B_phone ) %]<li><span class="label">Phone: </span><a href="tel:[% B_phone %]">[% B_phone %]</a></li>[% END %]
>-      [% IF ( B_email ) %]<li class="email"><span class="label">Email: </span><a title="[% B_email %]" href="mailto:[% B_email %]">[% B_email %]</a></li>[% END %]
>-      [% IF ( contactnote ) %]<li><span class="label">Contact note: </span> [% contactnote %]</li>[% END %]
>+      [% IF ( patron.B_phone ) %]<li><span class="label">Phone: </span><a href="tel:[% patron.B_phone %]">[% patron.B_phone %]</a></li>[% END %]
>+      [% IF ( patron.B_email ) %]<li class="email"><span class="label">Email: </span><a title="[% patron.B_email %]" href="mailto:[% patron.B_email %]">[% patron.B_email %]</a></li>[% END %]
>+      [% IF ( patron.contactnote ) %]<li><span class="label">Contact note: </span> [% patron.contactnote %]</li>[% END %]
>       </ol>
>     </div>
> </div>
>-<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=6">Edit</a></div>
>+<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=6">Edit</a></div>
>     [% END %]
> 
>  <div id="patron-alternative-contact" style="padding-top: 1em;">
>  <h3>Alternative contact</h3>
>-   <div class="rows"> <ol><li><span class="label">Surname: </span>[% altcontactsurname | html %]</li>
>-    <li><span class="label">First name: </span>[% altcontactfirstname | html %]</li>
>-    <li><span class="label">Address: </span>[% altcontactaddress1 | html %]</li>
>-    <li><span class="label">Address 2: </span>[% altcontactaddress2 | html %]</li>
>-	<li><span class="label">City: </span>[% altcontactaddress3 | html %]</li>
>-    [% IF ( altcontactstate ) %]<li><span class="label">State: </span>[% altcontactstate | html %]</li>[% END %]
>-    <li><span class="label">ZIP/Postal code: </span>[% altcontactzipcode | html %]</li>
>-	[% IF ( altcontactcountry ) %]<li><span class="label">Country: </span>[% altcontactcountry | html %]</li>[% END %]
>-    [% IF ( altcontactphone ) %]<li><span class="label">Phone: </span><a href="tel:[% altcontactphone | url %]">[% altcontactphone | html %]</a></li>[% END %]
>+   <div class="rows"> <ol><li><span class="label">Surname: </span>[% patron.altcontactsurname | html %]</li>
>+    <li><span class="label">First name: </span>[% patron.altcontactfirstname | html %]</li>
>+    <li><span class="label">Address: </span>[% patron.altcontactaddress1 | html %]</li>
>+    <li><span class="label">Address 2: </span>[% patron.altcontactaddress2 | html %]</li>
>+	<li><span class="label">City: </span>[% patron.altcontactaddress3 | html %]</li>
>+    [% IF ( patron.altcontactstate ) %]<li><span class="label">State: </span>[% patron.altcontactstate | html %]</li>[% END %]
>+    <li><span class="label">ZIP/Postal code: </span>[% patron.altcontactzipcode | html %]</li>
>+	[% IF ( patron.altcontactcountry ) %]<li><span class="label">Country: </span>[% patron.altcontactcountry | html %]</li>[% END %]
>+    [% IF ( patron.altcontactphone ) %]<li><span class="label">Phone: </span><a href="tel:[% patron.altcontactphone | url %]">[% patron.altcontactphone | html %]</a></li>[% END %]
>     </ol></div>
> </div>
>-<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=2">Edit</a></div>
>+<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=2">Edit</a></div>
> 
> </div>
> </div>
>@@ -608,7 +608,7 @@ function validate1(date) {
>     <fieldset class="action">
>         <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
>             <input type="hidden" name="from" value="borrower" />
>-            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>+            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>             <input type="submit" value="Suspend all holds" />
> 
>             [% IF AutoResumeSuspendedHolds %]
>@@ -622,7 +622,7 @@ function validate1(date) {
>     <fieldset class="action">
>         <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
>             <input type="hidden" name="from" value="borrower" />
>-            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>+            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>             <input type="hidden" name="suspend" value="0" />
>             <input type="submit" value="Resume all suspended holds" />
> 	</form>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>index 092cc0d8d7..290f20fc1e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>@@ -3,7 +3,7 @@
> [% USE Branches %]
> [% USE Price %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  [% borrower.firstname %] [% borrower.surname %]</title>
>+<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  [% patron.firstname %] [% patron.surname %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
> <script type= "text/javascript">
>@@ -48,7 +48,7 @@ function enableCheckboxActions(){
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'patron-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Pay fines for [% borrower.firstname %] [% borrower.surname %]</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Pay fines for [% patron.firstname %] [% patron.surname %]</div>
> 
> <div id="doc3" class="yui-t2">
>    
>@@ -60,16 +60,16 @@ function enableCheckboxActions(){
> 
> <div class="statictabs">
> <ul>
>-	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Account</a></li>
>-    <li class="active"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]" >Pay fines</a></li>
>-	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual invoice</a></li>
>-	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual credit</a></li>
>+    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
>+    <li class="active"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
>+    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
>+    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
> </ul>
> <div class="tabs-container">
> 
> [% IF ( accounts ) %]
>     <form action="/cgi-bin/koha/members/pay.pl" method="post" id="pay-fines-form">
>-	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
>+    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
> <p><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></p>
> <table id="finest">
> <thead>
>@@ -164,11 +164,11 @@ function enableCheckboxActions(){
> <input type="submit" id="paycollect" name="paycollect"  value="Pay amount" class="submit" />
> [% IF CAN_user_updatecharges_writeoff %]<input type="submit" name="woall"  id="woall" value="Write off all" class="submit" />[% END %]
> <input type="submit" id="payselected" name="payselected"  value="Pay selected" class="submit" />
>-<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a>
>+<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a>
> </fieldset>
> </form>
> [% ELSE %]
>-    <p>[% borrower.firstname %] [% borrower.surname %] has no outstanding fines.</p>
>+    <p>[% patron.firstname %] [% patron.surname %] has no outstanding fines.</p>
> [% END %]
> </div></div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>index 1e317bc816..aeb885e622 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -1,7 +1,7 @@
> [% USE Koha %]
> [% USE Branches %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for  [% borrower.firstname %] [% borrower.surname %]</title>
>+<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for  [% patron.firstname %] [% patron.surname %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <script type= "text/javascript">
> //<![CDATA[
>@@ -66,7 +66,7 @@ function moneyFormat(textObj) {
> <body id="pat_paycollect" class="pat">
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'patron-search.inc' %]
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Pay fines for [% borrower.firstname %] [% borrower.surname %]</a> &rsaquo; [% IF ( pay_individual ) %]Pay an individual fine[% ELSIF ( writeoff_individual ) %]Write off an individual fine[% ELSE %][% IF ( selected_accts ) %]Pay an amount toward selected fines[% ELSE %]Pay an amount toward all fines[% END %][% END %]</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Pay fines for [% patron.firstname %] [% patron.surname %]</a> &rsaquo; [% IF ( pay_individual ) %]Pay an individual fine[% ELSIF ( writeoff_individual ) %]Write off an individual fine[% ELSE %][% IF ( selected_accts ) %]Pay an amount toward selected fines[% ELSE %]Pay an amount toward all fines[% END %][% END %]</div>
> 
> <div id="doc3" class="yui-t2">
> 
>@@ -80,16 +80,16 @@ function moneyFormat(textObj) {
> <div class="statictabs">
> <ul>
>     <li>
>-    <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Account</a>
>+    <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a>
>     </li>
>     <li class="active">
>-    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]" >Pay fines</a>
>+    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a>
>     </li>
>     <li>
>-    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual invoice</a>
>+    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a>
>     </li>
>     <li>
>-    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual credit</a>
>+    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a>
>     </li>
> </ul>
> <div class="tabs-container">
>@@ -101,7 +101,7 @@ function moneyFormat(textObj) {
> 
> [% IF ( pay_individual ) %]
>     <form name="payindivfine" id="payindivfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
>-    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
>+    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
>     <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
>     <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
>     <input type="hidden" name="description" id="description" value="[% description %]" />
>@@ -152,13 +152,13 @@ function moneyFormat(textObj) {
> </fieldset>
> 
>     <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
>-        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
>+        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
>     </form>
> [% ELSIF ( writeoff_individual ) %]
>     <form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
>     <fieldset class="rows">
>     <legend>Write off an individual fine</legend>
>-    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
>+    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
>     <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
>     <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
>     <input type="hidden" name="description" id="description" value="[% description %]" />
>@@ -192,12 +192,12 @@ function moneyFormat(textObj) {
>     </table>
>     </fieldset>
>     <div class="action"><input type="submit" name="confirm_writeoff" id="confirm_writeoff" value="Write off this charge" />
>-        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
>+        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
>     </form>
> [% ELSE %]
> 
>     <form name="payfine" id="payfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
>-    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
>+    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
>     <input type="hidden" name="selected_accts" id="selected_accts" value="[% selected_accts %]" />
>     <input type="hidden" name="total" id="total" value="[% total %]" />
> 
>@@ -220,7 +220,7 @@ function moneyFormat(textObj) {
>     </ol>
>     </fieldset>
>     <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
>-        <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
>+        <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
>     </form>
> [% END %]
> </div></div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
>index a61d50799c..781743097a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
>@@ -1,7 +1,8 @@
> [% USE Koha %]
> [% USE KohaDates %]
>+[% USE Branches %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Print Receipt for [% cardnumber %]</title>
>+<title>Print Receipt for [% patron.cardnumber %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" />
> [% INCLUDE 'slip-print.inc' #printThenClose %]
>@@ -25,13 +26,13 @@
>  </tr>
>  <tr>
>     <th colspan=4 class="centerednames">
>-		[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
>+        <h2>[% Branches.GetName( patron.branchcode ) %]</h2>
> 	</th>
>  </tr>
>  <tr>
>     <th colspan=4 >
>-		Received with thanks from  [% firstname %] [% surname %] <br />
>-        Card number : [% cardnumber %]<br />
>+        Received with thanks from  [% patron.firstname %] [% patron.surname %] <br />
>+        Card number : [% patron.cardnumber %]<br />
> 	</th>
>  </tr>
>   <tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
>index 700421494b..7a5684efc4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
>@@ -1,6 +1,7 @@
> [% USE Koha %]
>+[% USE Branches %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Print receipt for [% cardnumber %]</title>
>+<title>Print receipt for [% patron.cardnumber %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" />
> [% INCLUDE 'slip-print.inc' #printThenClose %]
>@@ -24,13 +25,13 @@
>   </tr>
>   <tr>
>     <th colspan="5" class="centerednames">
>-		[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
>+        <h2>[% Branches.GetName( patron.branchcode ) %]</h2>
> 	</th>
>   </tr>
>   <tr>
>     <th colspan="5" >
>-        Bill to: [% firstname %] [% surname %] <br />
>-        Card number: [% cardnumber %]<br />
>+        Bill to: [% patron.firstname %] [% patron.surname %] <br />
>+        Card number: [% patron.cardnumber %]<br />
> 	</th>
>   </tr>
>   <tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>index a6f1e8f886..55885dada4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>@@ -37,7 +37,7 @@
>                 <h2>Purchase suggestions</h2>
> 
>                 <div id="toolbar" class="btn-toolbar">
>-                    <a class="btn btn-default btn-sm" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&amp;suggestedby=[% borrowernumber %]&amp;redirect=purchase_suggestions&amp;borrowernumber=[% borrowernumber %]"><i class="fa fa-plus"></i> New purchase suggestion</a>
>+                    <a class="btn btn-default btn-sm" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&amp;suggestedby=[% patron.borrowernumber %]&amp;redirect=purchase_suggestions&amp;borrowernumber=[% patron.borrowernumber %]"><i class="fa fa-plus"></i> New purchase suggestion</a>
>                 </div>
> 
>                 [% IF suggestions %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>index 5f2e1d836b..af1bac418e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>@@ -53,12 +53,12 @@
>     <div class="dialog alert">Staff members are not allowed to access patron's checkout history</div>
> [% ELSIF is_anonymous %]
>     <div class="dialog alert">This is the anonymous patron, so no circulation history is displayed. To get a list of anonymized loans, please run a report.</div>
>-[% ELSIF ( privacy == 2)  %]
>+[% ELSIF ( patron.privacy == 2)  %]
>     <div class="dialog message">This patron has set the privacy rules to never keeping a circulation history.</div>
> [% ELSIF ( !loop_reading ) %]
>     <div class="dialog message">This patron has no circulation history.</div>
> [% ELSE %]
>-<form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
>+<form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" /></form>
> 
> 
> <div id="tabs" class="toptabs">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>index be6d0effdc..b26066262c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>@@ -55,7 +55,7 @@
>                       </strong>
>                     </a>
>                     <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
>-                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>+                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>                   </td>
>                 </tr>
>                 [% END %]
>@@ -65,7 +65,7 @@
>           [% ELSE %]
>           <p>Patron does not belong to any subscription routing lists.</p>
>           <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
>-                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>+                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>                     [% END %]
> 
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>index d7091fbec7..e397c61fed 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>@@ -28,7 +28,7 @@
> <div id="breadcrumbs">
>          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
>-&rsaquo; [% UNLESS blocking_error  %]Statistics for [% firstname %] [% surname %] ([% cardnumber %])[% END %]
>+&rsaquo; [% UNLESS blocking_error  %]Statistics for [% paton.firstname %] [% patron.surname %] ([% patron.cardnumber %])[% END %]
> </div>
> 
> <div id="doc3" class="yui-t1">
>@@ -38,7 +38,7 @@
>         <div class="yui-b">
>         [% INCLUDE 'members-toolbar.inc' %]
> 
>-            <h3>Statistics for [% UNLESS ( I ) %][% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
>+            <h3>Statistics for [% UNLESS ( I ) %][% patron.title %] [% patron.firstname %] [% END %] [% patron.surname %] ([% patron.cardnumber %])</h3>
>             [% IF ( datas.size ) %]
>                 <table id="statistics">
>                 <thead>
>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 c0f83edbec..291c56f621 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -16,7 +16,7 @@
> <script type="text/javascript">
>     // <![CDATA[
> var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
>-var patron_homebranch = "[% Branches.GetName( borrower_branchcode ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
>+var patron_homebranch = "[% Branches.GetName( patron.branchcode ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
> var override_items = {[% FOREACH bibitemloo IN bibitemloop %][% FOREACH itemloo IN bibitemloo.itemloop %][% IF ( itemloo.override ) %]
>     [% itemloo.itemnumber %]: {
>         homebranch: "[% Branches.GetName( itemloo.homebranch ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]",
>@@ -174,7 +174,7 @@ function checkMultiHold() {
>     });
> 
> 
>-[% UNLESS ( borrowernumber || borrowers || noitems ) %]
>+[% UNLESS ( patron || patron.borrowernumber || borrowers || noitems ) %]
>     [% IF ( CircAutocompl ) %]
>     $( "#patron" ).autocomplete({
>         source: "/cgi-bin/koha/circ/ysearch.pl",
>@@ -244,7 +244,7 @@ function checkMultiHold() {
>     <h1>Confirm holds</h1>
>   [% END %]
> 
>-  [% UNLESS borrowernumber OR noitems %]
>+  [% UNLESS patron OR patron.borrowernumber OR noitems %]
>     [% IF ( messageborrower ) %]
>       <div class="dialog alert"><h3>Patron not found</h3><p>No patron with this name, please, try another</p> </div>
>     [% END %]
>@@ -277,29 +277,29 @@ function checkMultiHold() {
>       <h3>Cannot place hold</h3>
>       <ul>
>         [% IF ( exceeded_maxreserves ) %]
>-          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can only place a maximum of [% maxreserves %] total holds.</li>
>+          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can only place a maximum of [% maxreserves %] total holds.</li>
>         [% ELSIF ( exceeded_holds_per_record ) %]
>-          <li><strong>Too many holds for this record: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can only place a maximum of [% max_holds_for_record %] hold(s) on this record.</li>
>+          <li><strong>Too many holds for this record: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can only place a maximum of [% max_holds_for_record %] hold(s) on this record.</li>
>         [% ELSIF ( alreadypossession ) %]
>-          <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>is already in possession</strong> of one item.</li>
>+          <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a> <strong>is already in possession</strong> of one item.</li>
>         [% ELSIF ( alreadyreserved ) %]
>-          <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item.</li>
>+          <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a> <strong>already has a hold</strong> on this item.</li>
>         [% ELSIF ( ageRestricted ) %]
>           <li><strong>Age restricted</strong></li>
>         [% ELSIF ( none_available ) %]
>           <li> <strong>No items are available</strong> to be placed on hold.</li>
>         [% ELSIF ( maxreserves ) %]
>-          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> has too many holds.</li>
>+          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> has too many holds.</li>
>         [% END %]
>       </ul>
>     [% ELSE %]
>         <h3>Cannot place hold on some items</h3>
>         [% IF ( exceeded_maxreserves ) %]
>-          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can place [% new_reserves_allowed %] of the requested [% new_reserves_count %] holds for a maximum of [% maxreserves %] total holds.</li>
>+          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can place [% new_reserves_allowed %] of the requested [% new_reserves_count %] holds for a maximum of [% maxreserves %] total holds.</li>
>         [% ELSIF ( exceeded_holds_per_record ) %]
>             [% FOREACH biblioloo IN biblioloop %]
>                 [% IF (biblioloo.tooManyHoldsForThisRecord) %]
>-                    <li><strong>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber %]"> [% biblioloo.title %]</a>: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can only place a maximum of [% max_holds_for_record %] hold(s) on this record.</li>
>+                    <li><strong>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber %]"> [% biblioloo.title %]</a>: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can only place a maximum of [% max_holds_for_record %] hold(s) on this record.</li>
>                 [% END %]
>             [% END %]
>         [% END %]
>@@ -308,22 +308,22 @@ function checkMultiHold() {
>     </div>
> [% END %]
> 
>-[% IF ( expiry || diffbranch || restricted || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
>+[% IF ( expiry || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
> <div class="dialog message"><ul>
>     [% IF ( expiry ) %]
>-    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a>: <strong>Account has expired</strong></li>
>+    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron,surname %]</a>: <strong>Account has expired</strong></li>
>     [% END %]
> 
>-    [% IF restricted %]
>-    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]#reldebarments">[% borrowerfirstname %] [% borrowersurname %]</a>: <strong>Patron has restrictions</strong></li>
>+    [% IF patron.is_debarred %]
>+    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]#reldebarments">[% patron.firstname %] [% patron.surname %]</a>: <strong>Patron has restrictions</strong></li>
>     [% END %]
> 
>     [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
>-    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a>: <strong>Patron has outstanding fines: [% amount_outstanding | format('%.2f') %]</strong></li>
>+    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a>: <strong>Patron has outstanding fines: [% amount_outstanding | format('%.2f') %]</strong></li>
>     [% END %]
> 
>     [% IF ( diffbranch ) %]
>-    <li> <strong>Pickup library is different. </strong>Patron: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> Patron's home library: ([% borrower_branchname %] / [% borrower_branchcode %] )</li>
>+    <li> <strong>Pickup library is different. </strong>Patron: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a> Patron's home library: ([% Branches.GetName( patron.branchcode ) %] / [% patron.branchcode %] )</li>
>     [% END %]
> 
> </ul></div>
>@@ -341,7 +341,7 @@ function checkMultiHold() {
>             <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form">
>         [% END %]
> 
>-        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>+        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>         <input type="hidden" name="type" value="str8" />
> 
>         [% IF ( multi_hold ) %]
>@@ -360,8 +360,8 @@ function checkMultiHold() {
>         [% END %]
> 
>        <ol> <li><span class="label">Patron:</span>
>-            [% IF ( borrowernumber ) %]
>-                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] ([% cardnumber %])</a>
>+            [% IF ( patron.borrowernumber ) %]
>+                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] ([% cardnumber %])</a>
>             [% ELSE %]
>                 Not defined yet
>             [% END %]
>@@ -438,7 +438,7 @@ function checkMultiHold() {
> </ol>
>    [% UNLESS ( multi_hold ) %]
>         <fieldset class="action">
>-            [% IF ( borrowernumber ) %]
>+            [% IF ( patron.borrowernumber ) %]
>                 [% IF ( override_required ) %]
>                     <input type="submit" class="warning" value="Place hold" />
>                 [% ELSIF ( none_available ) %]
>@@ -576,9 +576,9 @@ function checkMultiHold() {
>                             Can't be cancelled when item is in transit
>                     [% ELSE %]
>                     [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
>-                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">[% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% Branches.GetName( itemloo.ExpectedAtLibrary ) %]
>+                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedFor.borrowernumber %]">[% itemloo.ReservedFor.firstname %] [% itemloo.ReservedFor.surname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% Branches.GetName( itemloo.ExpectedAtLibrary ) %]
>                     since
>-                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&amp;CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&amp;CancelItemnumber=[% itemloo.itemnumber %]"  onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);">Cancel hold</a>
>+                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&amp;CancelBorrowerNumber=[% itemloo.ReservedFor.borrowernumber %]&amp;CancelItemnumber=[% itemloo.itemnumber %]"  onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);">Cancel hold</a>
> 
>                     [% END %]
>                 [% ELSE %]
>@@ -649,7 +649,7 @@ function checkMultiHold() {
>             [% END %]
> 
>           [% IF ( biblioloo.alreadyres ) %]
>-              <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li>
>+              <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a> <strong>already has a hold</strong> on this item </li>
>           [% END %]
>           [% IF ( biblioloo.none_avail ) %]
>               <li> <strong>No items are available</strong> to be placed on hold</li>
>@@ -671,7 +671,7 @@ function checkMultiHold() {
>   [% END %]
> 
>     <fieldset class="action">
>-        [% IF ( borrowernumber ) %]
>+        [% IF ( patron AND patron.borrowernumber ) %]
>             [% IF ( override_required ) %]
>                 <input type="submit" class="warning" value="Place hold" />
>             [% ELSIF ( none_available ) %]
>@@ -685,7 +685,7 @@ function checkMultiHold() {
> 	</fieldset>
> [% END %]
> 
>-[% UNLESS ( borrowernumber ) %]
>+[% UNLESS ( patron ) %]
> [% IF ( reserveloop ) %]
> <form name="T[% time %]" action="modrequest.pl" method="post">
>   [% IF ( multi_hold ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
>index 5373fc3fc9..4b736affcb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
>@@ -44,7 +44,7 @@
>     <tbody>[% FOREACH review IN reviews %]
>     <tr>
>         <td>
>-            [% IF ( review.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber %]">[% review.surname %], [% review.firstname %]</a>[% ELSE %](deleted patron)[% END %]
>+            [% IF ( review.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber %]">[% review.patron.surname %], [% review.patron.firstname %]</a>[% ELSE %](deleted patron)[% END %]
>         </td>
>         <td>
>             <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber %]">[% review.bibliotitle %]</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>index e5706c679c..ee51be79c3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>@@ -208,13 +208,21 @@
>                                 <tr>
>                                     <td>[% loopro.timestamp %]</td>
>                                     <td>
>-                                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.user %]" title="display detail for this librarian."> [% IF ( loopro.userfirstname ) || ( loopro.usersurname ) %][% loopro.userfirstname %] [% loopro.usersurname %] ([% loopro.user %]) [% ELSE %][% loopro.user %][% END %]</a>
>+                                        [% IF loopro.librarian %]
>+                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.librarian.borrowernumber %]" title="display detail for this librarian."> [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname %] [% loopro.librarian.surname %] ([% loopro.librarian.borrowernumber %]) [% ELSE %][% loopro.librarian.borrowernumber %][% END %]</a>
>+                                        [% ELSE %]
>+                                            [% loopro.user %]
>+                                        [% END %]
>                                     </td>
>                                     <td>[% PROCESS translate_log_module module=loopro.module %]</td>
>                                     <td>[% PROCESS translate_log_action action=loopro.action %]</td>
>                                     <td>
>                                         [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
>-                                             <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.borrowerfirstname ) || ( loopro.borrowersurname ) %][% loopro.borrowerfirstname %] [% loopro.borrowersurname %] ([% loopro.object %]) [% ELSE %]Member [% loopro.object %][% END %][% END %] </a>
>+                                            [% IF loopro.patron %]
>+                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname %] [% loopro.patron.surname %] ([% loopro.object %]) [% ELSE %]Member [% loopro.object %][% END %][% END %] </a>
>+                                            [% ELSE %]
>+                                                [% loopro.object %]
>+                                            [% END %]
>                                         [% ELSE %]
>                                                 [% IF ( loopro.module == 'CATALOGUING' ) %]
>                                                     [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>index d95dc8c3eb..6158cc1a06 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>@@ -930,15 +930,15 @@
>                                                     [% END %]
>                                                     [% SWITCH ShowReviewer %]
>                                                     [% CASE 'full' %]
>-                                                        <h5>Comment by [% review.title %] [% review.firstname %] [% review.surname %]</h5>
>+                                                        <h5>Comment by [% review.patron.title %] [% review.patron.firstname %] [% review.patron.surname %]</h5>
>                                                     [% CASE 'first' %]
>-                                                        <h5>Comment by [% review.firstname %]</h5>
>+                                                        <h5>Comment by [% review.patron.firstname %]</h5>
>                                                     [% CASE 'surname' %]
>-                                                        <h5>Comment by [% review.surname %]</h5>
>+                                                        <h5>Comment by [% review.patron.surname %]</h5>
>                                                     [% CASE 'firstandinitial' %]
>-                                                        <h5>Comment by [% review.firstname %] [% review.surname|truncate(2,'.') %]</h5>
>+                                                        <h5>Comment by [% review.patron.firstname %] [% review.patron.surname|truncate(2,'.') %]</h5>
>                                                     [% CASE 'username' %]
>-                                                        <h5>Comment by [% review.userid %]</h5>
>+                                                        <h5>Comment by [% review.patron.userid %]</h5>
>                                                     [% END %]
>                                                     <small>[% review.datereviewed | $KohaDates %]</small>
>                                                 [% ELSIF ( ShowReviewer == "none") %]
>diff --git a/members/boraccount.pl b/members/boraccount.pl
>index 65d2c627be..19d40ced0c 100755
>--- a/members/boraccount.pl
>+++ b/members/boraccount.pl
>@@ -105,11 +105,9 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
>     );
> }
> 
>-$template->param(%{ $patron->unblessed });
>-
> $template->param(
>+    patron              => $patron,
>     finesview           => 1,
>-    borrowernumber      => $borrowernumber,
>     total               => sprintf("%.2f",$total),
>     totalcredit         => $totalcredit,
>     is_child            => ($patron->category->category_type eq 'C'),
>diff --git a/members/deletemem.pl b/members/deletemem.pl
>index 73f89ed610..5dd1f6f876 100755
>--- a/members/deletemem.pl
>+++ b/members/deletemem.pl
>@@ -114,23 +114,7 @@ if ( $op eq 'delete_confirm' or $countissues > 0 or $flags->{'CHARGES'}  or $is_
>     $template->param( adultborrower => 1 ) if $patron->category->category_type =~ /^(A|I)$/;
> 
>     $template->param(
>-        # FIXME The patron object should be passed to the template
>-        borrowernumber => $patron->borrowernumber,
>-        surname => $patron->surname,
>-        title => $patron->title,
>-        cardnumber => $patron->cardnumber,
>-        firstname => $patron->firstname,
>-        categorycode => $patron->categorycode,
>-        category_type => $patron->category->category_type,
>-        categoryname  => $patron->category->description,
>-        address => $patron->address,
>-        address2 => $patron->address2,
>-        city => $patron->city,
>-        zipcode => $patron->zipcode,
>-        country => $patron->country,
>-        phone => $patron->phone,
>-        email => $patron->email,
>-        branchcode => $patron->branchcode,
>+        patron => $patron,
>         RoutingSerials => C4::Context->preference('RoutingSerials'),
>     );
>     if ($countissues >0) {
>diff --git a/members/discharge.pl b/members/discharge.pl
>index ca7c44f45e..bd425684f9 100755
>--- a/members/discharge.pl
>+++ b/members/discharge.pl
>@@ -66,9 +66,6 @@ my $can_be_discharged = Koha::Patron::Discharge::can_be_discharged({
>     borrowernumber => $borrowernumber
> });
> 
>-my $holds = $patron->holds;
>-my $has_reserves = $holds->count;
>-
> # Generating discharge if needed
> if ( $input->param('discharge') and $can_be_discharged ) {
>     my $is_discharged = Koha::Patron::Discharge::is_discharged({
>@@ -109,28 +106,7 @@ my @validated_discharges = Koha::Patron::Discharge::get_validated({
> $template->param( picture => 1 ) if $patron->image;
> 
> $template->param(
>-    # FIXME The patron object should be passed to the template
>-    borrowernumber    => $borrowernumber,
>-    title             => $patron->title,
>-    initials          => $patron->initials,
>-    surname           => $patron->surname,
>-    borrowernumber    => $borrowernumber,
>-    firstname         => $patron->firstname,
>-    cardnumber        => $patron->cardnumber,
>-    categorycode      => $patron->categorycode,
>-    category_type     => $patron->category->category_type,
>-    categoryname      => $patron->category->description,
>-    address           => $patron->address,
>-    streetnumber      => $patron->streetnumber,
>-    streettype        => $patron->streettype,
>-    address2          => $patron->address2,
>-    city              => $patron->city,
>-    zipcode           => $patron->zipcode,
>-    country           => $patron->country,
>-    phone             => $patron->phone,
>-    email             => $patron->email,
>-    branchcode        => $patron->branchcode,
>-    has_reserves      => $has_reserves,
>+    patron => $patron,
>     can_be_discharged => $can_be_discharged,
>     validated_discharges => \@validated_discharges,
> );
>diff --git a/members/files.pl b/members/files.pl
>index b302aac29e..2617843ad3 100755
>--- a/members/files.pl
>+++ b/members/files.pl
>@@ -68,7 +68,7 @@ if ( $op eq 'download' ) {
>     print $file->{'file_content'};
> }
> else {
>-    $template->param(%{ $patron->unblessed});
>+    $template->param( patron => $patron );
> 
>     my %errors;
> 
>@@ -106,7 +106,6 @@ else {
>     }
> 
>     $template->param(
>-        categoryname    => $patron->category->description,
>         RoutingSerials => C4::Context->preference('RoutingSerials'),
>     );
> 
>diff --git a/members/housebound.pl b/members/housebound.pl
>index 64f4c54136..c659d0c14e 100755
>--- a/members/housebound.pl
>+++ b/members/housebound.pl
>@@ -63,9 +63,8 @@ output_and_exit_if_error( $input, $cookie, $template, { module => 'members', log
> 
> # Get supporting cast
> my ( $branch, $category, $houseboundprofile, $visit, $patron_image );
>-if ( $patron ) {
>+if ( $patron ) { # FIXME This test is not needed - output_and_exit_if_error handles it
>     $patron_image = $patron->image;
>-    $branch = Koha::Libraries->new->find($patron->branchcode);
>     $category = Koha::Patron::Categories->new->find($patron->categorycode);
>     $houseboundprofile = $patron->housebound_profile;
> }
>@@ -158,7 +157,7 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) {
> $method = 'update_or_create' if ( !$houseboundprofile );
> 
> # Ensure template has all patron details.
>-$template->param(%{$patron->unblessed}) if ( $patron );
>+$template->param( patron => $patron );
> 
> # Load extended patron attributes if necessary (taken from members/files.pl).
> if ( C4::Context->preference('ExtendedPatronAttributes') and $patron ) {
>@@ -174,8 +173,6 @@ $template->param(
>     picture            => $patron_image,
>     housebound_profile => $houseboundprofile,
>     visit              => $houseboundvisit,
>-    branch             => $branch,
>-    category           => $category,
>     messages           => \@messages,
>     method             => $method,
>     choosers           => $choosers,
>diff --git a/members/mancredit.pl b/members/mancredit.pl
>index 048178cc42..7fa67942e0 100755
>--- a/members/mancredit.pl
>+++ b/members/mancredit.pl
>@@ -93,12 +93,10 @@ if ($add){
>         );
>     }
> 
>-    $template->param(%{ $patron->unblessed});
>+    $template->param( patron => $patron );
> 
>     $template->param(
>         finesview      => 1,
>-        borrowernumber => $borrowernumber,
>-        categoryname   => $patron->category->description,
>         is_child       => ($patron->category->category_type eq 'C'), # FIXME is_child should be a Koha::Patron method
>         RoutingSerials => C4::Context->preference('RoutingSerials'),
>         );
>diff --git a/members/maninvoice.pl b/members/maninvoice.pl
>index a41595c7d5..6ba997cf07 100755
>--- a/members/maninvoice.pl
>+++ b/members/maninvoice.pl
>@@ -91,7 +91,6 @@ if ($add){
>     });
> 
>     my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
>-    my $patron         = Koha::Patrons->find($borrowernumber);
>     output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
>   # get authorised values with type of MANUAL_INV
>@@ -121,11 +120,9 @@ if ($add){
>         );
>     }
> 
>-    $template->param(%{ $patron->unblessed });
>     $template->param(
>+        patron         => $patron,
>         finesview      => 1,
>-        borrowernumber => $borrowernumber,
>-        categoryname   => $patron->category->description,
>         is_child       => ($patron->category->category_type eq 'C'),
>         RoutingSerials => C4::Context->preference('RoutingSerials'),
>     );
>diff --git a/members/member-flags.pl b/members/member-flags.pl
>index bb9f5ffb6d..6d4a3c46e1 100755
>--- a/members/member-flags.pl
>+++ b/members/member-flags.pl
>@@ -196,27 +196,7 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
> }
> 
> $template->param(
>-		borrowernumber => $bor->{'borrowernumber'},
>-    cardnumber => $bor->{'cardnumber'},
>-		surname => $bor->{'surname'},
>-		firstname => $bor->{'firstname'},
>-        othernames => $bor->{'othernames'},
>-		categorycode => $bor->{'categorycode'},
>-		category_type => $category_type,
>-		categoryname => $bor->{'description'},
>-        address => $bor->{address},
>-		address2 => $bor->{'address2'},
>-        streettype => $bor->{streettype},
>-		city => $bor->{'city'},
>-        state => $bor->{'state'},
>-		zipcode => $bor->{'zipcode'},
>-		country => $bor->{'country'},
>-		phone => $bor->{'phone'},
>-        phonepro => $bor->{'phonepro'},
>-        mobile => $bor->{'mobile'},
>-		email => $bor->{'email'},
>-        emailpro => $bor->{'emailpro'},
>-		branchcode => $bor->{'branchcode'},
>+    patron => $patron,
> 		loop => \@loop,
> 		is_child        => ($category_type eq 'C'),
>         RoutingSerials => C4::Context->preference('RoutingSerials'),
>diff --git a/members/member-password.pl b/members/member-password.pl
>index 81d3971c8a..ffdfce9603 100755
>--- a/members/member-password.pl
>+++ b/members/member-password.pl
>@@ -120,29 +120,7 @@ if ( C4::Context->preference('ExtendedPatronAttributes') ) {
> }
> 
> $template->param(
>-    othernames                 => $bor->{'othernames'},
>-    surname                    => $bor->{'surname'},
>-    firstname                  => $bor->{'firstname'},
>-    borrowernumber             => $bor->{'borrowernumber'},
>-    cardnumber                 => $bor->{'cardnumber'},
>-    categorycode               => $bor->{'categorycode'},
>-    category_type              => $category_type,
>-    categoryname               => $bor->{'description'},
>-    address                    => $bor->{address},
>-    address2                   => $bor->{'address2'},
>-    streettype                 => $bor->{streettype},
>-    city                       => $bor->{'city'},
>-    state                      => $bor->{'state'},
>-    zipcode                    => $bor->{'zipcode'},
>-    country                    => $bor->{'country'},
>-    phone                      => $bor->{'phone'},
>-    phonepro                   => $bor->{'phonepro'},
>-    streetnumber               => $bor->{'streetnumber'},
>-    mobile                     => $bor->{'mobile'},
>-    email                      => $bor->{'email'},
>-    emailpro                   => $bor->{'emailpro'},
>-    branchcode                 => $bor->{'branchcode'},
>-    userid                     => $bor->{'userid'},
>+    patron                     => $patron,
>     destination                => $destination,
>     is_child                   => ( $category_type eq 'C' ),
>     minPasswordLength          => $minpw,
>diff --git a/members/moremember.pl b/members/moremember.pl
>index 96dcb00513..8e19c36253 100755
>--- a/members/moremember.pl
>+++ b/members/moremember.pl
>@@ -137,7 +137,7 @@ my $category_type = $patron->category->category_type;
> my $data = $patron->unblessed;
> 
> $debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
>-foreach (qw(dateenrolled dateexpiry dateofbirth)) {
>+foreach (qw(dateenrolled dateexpiry dateofbirth)) { # FIXME This should be removed
>     my $userdate = $data->{$_};
>     unless ($userdate) {
>         $debug and warn sprintf "Empty \$data{%12s}", $_;
>@@ -154,7 +154,7 @@ for (qw(gonenoaddress lost borrowernotes)) {
> 
> if ( $patron->is_debarred ) {
>     $template->param(
>-        userdebarred => 1,
>+        userdebarred => 1, # FIXME Template should use patron->is_debarred
>         flagged => 1,
>         debarments => GetDebarments({ borrowernumber => $borrowernumber }),
>     );
>@@ -214,7 +214,7 @@ else {
>     $samebranch = 1;
> }
> my $library = Koha::Libraries->find( $data->{branchcode})->unblessed;
>-@{$data}{keys %$library} = values %$library; # merge in all branch columns
>+@{$data}{keys %$library} = values %$library; # merge in all branch columns # FIXME This is really ugly, we should pass the library instead
> 
> my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
> 
>@@ -232,7 +232,7 @@ if ($print eq "page") {
> }
> 
> # Show OPAC privacy preference is system preference is set
>-if ( C4::Context->preference('OPACPrivacy') ) {
>+if ( C4::Context->preference('OPACPrivacy') ) { # FIXME Should be moved the the template
>     $template->param( OPACPrivacy => 1);
>     $template->param( "privacy".$data->{'privacy'} => 1);
> }
>@@ -283,7 +283,7 @@ $template->param(
> );
> 
> 
>-$template->param(%$data);
>+$template->param(%$data); # FIXME This should be removed and used $patron instead, but too many things are processed above
> 
> if (C4::Context->preference('ExtendedPatronAttributes')) {
>     my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
>@@ -321,7 +321,6 @@ if (C4::Context->preference('EnhancedMessagingPreferences')) {
>     C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template);
>     $template->param(messaging_form_inactive => 1);
>     $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
>-    $template->param(SMSnumber     => $data->{'smsalertnumber'});
>     $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
> }
> 
>@@ -341,9 +340,6 @@ $template->param(
>     patron          => $patron,
>     translated_language => $translated_language,
>     detailview      => 1,
>-    borrowernumber  => $borrowernumber,
>-    othernames      => $data->{'othernames'},
>-    categoryname    => $data->{'description'},
>     was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
>     todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
>     totalprice      => sprintf("%.2f", $totalprice),
>@@ -355,7 +351,6 @@ $template->param(
>     samebranch      => $samebranch,
>     quickslip       => $quickslip,
>     housebound_role => scalar $patron->housebound_role,
>-    privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'},
>     AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
>     SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
>     RoutingSerials => C4::Context->preference('RoutingSerials'),
>diff --git a/members/notices.pl b/members/notices.pl
>index 13b9bc7a2a..5a53809836 100755
>--- a/members/notices.pl
>+++ b/members/notices.pl
>@@ -48,7 +48,6 @@ my ($template, $loggedinuser, $cookie)
> my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
> output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
>-$template->param( $borrower );
> $template->param( picture => 1 ) if $patron->image;
> 
> # Allow resending of messages in Notices tab
>@@ -74,13 +73,12 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
>     );
> }
> 
>-$template->param(%$borrower);
> $template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
> $template->param(
>+    patron             => $patron,
>     QUEUED_MESSAGES    => $queued_messages,
>     borrowernumber     => $borrowernumber,
>     sentnotices        => 1,
>-    categoryname       => $patron->category->description,
>     RoutingSerials => C4::Context->preference('RoutingSerials'),
> );
> output_html_with_http_headers $input, $cookie, $template->output;
>diff --git a/members/pay.pl b/members/pay.pl
>index 0f16c5150f..afaa9733f1 100755
>--- a/members/pay.pl
>+++ b/members/pay.pl
>@@ -68,13 +68,9 @@ if ( !$borrowernumber ) {
> 
> # get borrower details
> my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
>-my $patron         = Koha::Patrons->find($borrowernumber);
>+our $patron         = Koha::Patrons->find($borrowernumber);
> output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
>-my $category = $patron->category;
>-our $borrower = $patron->unblessed;
>-$borrower->{description} = $category->description;
>-$borrower->{category_type} = $category->category_type;
> our $user = $input->remote_user;
> $user ||= q{};
> 
>@@ -148,16 +144,13 @@ sub add_accounts_to_template {
>               };
>         }
>     }
>-    borrower_add_additional_fields($borrower);
>-
>-    $template->param(%$borrower);
>+    borrower_add_additional_fields($patron->unblessed);
> 
>     my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
>     $template->param( picture => 1 ) if $patron_image;
>     $template->param(
>         accounts => $accounts,
>-        borrower => $borrower,
>-        categoryname => $borrower->{'description'},
>+        patron   => $patron,
>         total    => $total,
>     );
>     return;
>diff --git a/members/paycollect.pl b/members/paycollect.pl
>index 301ed5f729..1eb9af0aa9 100755
>--- a/members/paycollect.pl
>+++ b/members/paycollect.pl
>@@ -56,8 +56,6 @@ output_and_exit_if_error( $input, $cookie, $template, { module => 'members', log
> 
> my $borrower       = $patron->unblessed;
> my $category       = $patron->category;
>-$borrower->{description} = $category->description;
>-$borrower->{category_type} = $category->category_type;
> my $user           = $input->remote_user;
> 
> my $branch         = C4::Context->userenv->{'branch'};
>@@ -181,8 +179,7 @@ $template->param(%$borrower);
> 
> $template->param(
>     borrowernumber => $borrowernumber,    # some templates require global
>-    borrower      => $borrower,
>-    categoryname  => $borrower->{description},
>+    patron        => $patron,
>     total         => $total_due,
>     RoutingSerials => C4::Context->preference('RoutingSerials'),
>     ExtendedPatronAttributes => C4::Context->preference('ExtendedPatronAttributes'),
>diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
>index 2d069410bc..ec3d68086c 100755
>--- a/members/printfeercpt.pl
>+++ b/members/printfeercpt.pl
>@@ -55,15 +55,12 @@ my $patron         = Koha::Patrons->find( $borrowernumber );
> output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
> my $category = $patron->category;
>-my $data = $patron->unblessed;
>-$data->{description} = $category->description;
>-$data->{category_type} = $category->category_type;
> 
> if ( $action eq 'print' ) {
> #  ReversePayment( $borrowernumber, $input->param('accountno') );
> }
> 
>-if ( $data->{'category_type'} eq 'C') {
>+if ( $category->category_type eq 'C') {
>     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>     $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
>@@ -118,31 +115,16 @@ for (my $i=0;$i<$numaccts;$i++){
>     push(@accountrows, \%row);
> }
> 
>-$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
>+$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
> 
> $template->param( picture => 1 ) if $patron->image;
> 
> $template->param(
>+    patron               => $patron,
>     finesview           => 1,
>-    firstname           => $data->{'firstname'},
>-    surname             => $data->{'surname'},
>-    borrowernumber      => $borrowernumber,
>-    cardnumber          => $data->{'cardnumber'},
>-    categorycode        => $data->{'categorycode'},
>-    category_type       => $data->{'category_type'},
>- #   category_description => $data->{'description'},
>-    categoryname		 => $data->{'description'},
>-    address             => $data->{'address'},
>-    address2            => $data->{'address2'},
>-    city                => $data->{'city'},
>-    zipcode             => $data->{'zipcode'},
>-    country             => $data->{'country'},
>-    phone               => $data->{'phone'},
>-    email               => $data->{'email'},
>-    branchcode          => $data->{'branchcode'},
>     total               => sprintf("%.2f",$total),
>     totalcredit         => $totalcredit,
>-	is_child        => ($data->{'category_type'} eq 'C'),
>+    is_child            => ($category->category_type eq 'C'),
>     accounts            => \@accountrows );
> 
> output_html_with_http_headers $input, $cookie, $template->output;
>diff --git a/members/printinvoice.pl b/members/printinvoice.pl
>index c2685106ac..b9d67a70f3 100755
>--- a/members/printinvoice.pl
>+++ b/members/printinvoice.pl
>@@ -54,11 +54,8 @@ my $patron         = Koha::Patrons->find( $borrowernumber );
> output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
> my $category = $patron->category;
>-my $data = $patron->unblessed;
>-$data->{description} = $category->description;
>-$data->{category_type} = $category->category_type;
> 
>-if ( $data->{'category_type'} eq 'C' ) {
>+if ( $category->category_type eq 'C' ) {
>     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>     $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
>@@ -118,30 +115,16 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
>     push( @accountrows, \%row );
> }
> 
>-$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
>+$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
> 
> $template->param( picture => 1 ) if $patron->image;
> 
> $template->param(
>+    patron         => $patron,
>     finesview      => 1,
>-    firstname      => $data->{'firstname'},
>-    surname        => $data->{'surname'},
>-    borrowernumber => $borrowernumber,
>-    cardnumber     => $data->{'cardnumber'},
>-    categorycode   => $data->{'categorycode'},
>-    category_type  => $data->{'category_type'},
>-    categoryname   => $data->{'description'},
>-    address        => $data->{'address'},
>-    address2       => $data->{'address2'},
>-    city           => $data->{'city'},
>-    zipcode        => $data->{'zipcode'},
>-    country        => $data->{'country'},
>-    phone          => $data->{'phone'},
>-    email          => $data->{'email'},
>-    branchcode     => $data->{'branchcode'},
>     total          => sprintf( "%.2f", $total ),
>     totalcredit    => $totalcredit,
>-    is_child       => ( $data->{'category_type'} eq 'C' ),
>+    is_child       => ( $category->category_type eq 'C' ),
>     accounts       => \@accountrows
> );
> 
>diff --git a/members/purchase-suggestions.pl b/members/purchase-suggestions.pl
>index 537cd7dd49..2fbf443af3 100755
>--- a/members/purchase-suggestions.pl
>+++ b/members/purchase-suggestions.pl
>@@ -47,15 +47,9 @@ my $patron         = Koha::Patrons->find( $borrowernumber );
> output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
> my $category = $patron->category;
>-my $data = $patron->unblessed;
>-$data->{description} = $category->description;
>-$data->{category_type} = $category->category_type;
>-foreach my $key ( keys %$data ) {
>-    $template->param( $key => $data->{$key} );
>-}
> $template->param(
>+    patron => $patron,
>     suggestionsview  => 1,
>-    categoryname => $data->{'description'},
>     RoutingSerials => C4::Context->preference('RoutingSerials'),
> );
> 
>diff --git a/members/readingrec.pl b/members/readingrec.pl
>index 18b5755cae..5a771b8f87 100755
>--- a/members/readingrec.pl
>+++ b/members/readingrec.pl
>@@ -37,11 +37,6 @@ use Koha::Patron::Categories;
> 
> my $input = CGI->new;
> 
>-#get borrower details
>-my $data = undef;
>-my $borrowernumber = undef;
>-my $cardnumber = undef;
>-
> my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tt",
> 				query => $input,
> 				type => "intranet",
>@@ -53,15 +48,12 @@ my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name =>
> my $op = $input->param('op') || '';
> my $patron;
> if ($input->param('cardnumber')) {
>-    $cardnumber = $input->param('cardnumber');
>+    my $cardnumber = $input->param('cardnumber');
>     $patron = Koha::Patrons->find( { cardnumber => $cardnumber } );
>-    $data = $patron->unblessed;
>-    $borrowernumber = $data->{'borrowernumber'}; # we must define this as it is used to retrieve other data about the patron
> }
> if ($input->param('borrowernumber')) {
>-    $borrowernumber = $input->param('borrowernumber');
>+    my $borrowernumber = $input->param('borrowernumber');
>     $patron = Koha::Patrons->find( $borrowernumber );
>-    $data = $patron->unblessed;
> }
> 
> my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
>@@ -71,22 +63,22 @@ my $order = 'date_due desc';
> my $limit = 0;
> my $issues = ();
> # Do not request the old issues of anonymous patron
>-if ( $borrowernumber eq C4::Context->preference('AnonymousPatron') ){
>+if ( $patron->borrowernumber eq C4::Context->preference('AnonymousPatron') ){
>     # use of 'eq' in the above comparison is intentional -- the
>     # system preference value could be blank
>     $template->param( is_anonymous => 1 );
> } else {
>-    $issues = GetAllIssues($borrowernumber,$order,$limit);
>+    $issues = GetAllIssues($patron->borrowernumber,$order,$limit);
> }
> 
> #   barcode export
> if ( $op eq 'export_barcodes' ) {
>     # FIXME This should be moved out of this script
>-    if ( $data->{'privacy'} < 2) {
>+    if ( $patron->privacy < 2) {
>         my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
>         my @barcodes =
>           map { $_->{barcode} } grep { $_->{returndate} =~ m/^$today/o } @{$issues};
>-        my $borrowercardnumber = $data->{cardnumber};
>+        my $borrowercardnumber = $patron->cardnumber;
>         my $delimiter = "\n";
>         binmode( STDOUT, ":encoding(UTF-8)" );
>         print $input->header(
>@@ -101,13 +93,14 @@ if ( $op eq 'export_barcodes' ) {
>     }
> }
> 
>-if ( $data->{'category_type'} eq 'C') {
>+my $category = $patron->category;
>+if ( $category->category_type eq 'C') {
>     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
>     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
>     $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
> }
> 
>-$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
>+$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
> if (! $limit){
> 	$limit = 'full';
> }
>@@ -115,21 +108,17 @@ if (! $limit){
> $template->param( picture => 1 ) if $patron->image;
> 
> if (C4::Context->preference('ExtendedPatronAttributes')) {
>-    my $attributes = GetBorrowerAttributes($borrowernumber);
>+    my $attributes = GetBorrowerAttributes($patron->borrowernumber);
>     $template->param(
>         ExtendedPatronAttributes => 1,
>         extendedattributes => $attributes
>     );
> }
> 
>-$template->param(%$data);
>-
> $template->param(
>+    patron            => $patron,
>     readingrecordview => 1,
>-    borrowernumber    => $borrowernumber,
>-    privacy           => $data->{'privacy'},
>-    categoryname      => $data->{description},
>-    is_child          => ( $data->{category_type} eq 'C' ),
>+    is_child          => ( $category->category_type eq 'C' ),
>     loop_reading      => $issues,
>     RoutingSerials => C4::Context->preference('RoutingSerials'),
> );
>diff --git a/members/routing-lists.pl b/members/routing-lists.pl
>index 0528572d40..adacbd8c20 100755
>--- a/members/routing-lists.pl
>+++ b/members/routing-lists.pl
>@@ -52,9 +52,6 @@ my $patron         = Koha::Patrons->find( $borrowernumber );
> output_and_exit_if_error( $query, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
> my $category = $patron->category;
>-my $patron_info = $patron->unblessed;
>-$patron_info->{description} = $category->description;
>-$patron_info->{category_type} = $category->category_type;
> 
> my $count;
> my @borrowerSubscriptions;
>@@ -75,18 +72,12 @@ $template->param(
>     routinglistview => 1
> );
> 
>-$template->param( adultborrower => 1 ) if ( $patron_info->{category_type} =~ /^(A|I)$/ );
>-
>-##################################################################################
>-
>-$template->param(%$patron_info);
>+$template->param( adultborrower => 1 ) if ( $category->category_type =~ /^(A|I)$/ );
> 
> $template->param(
>+    patron            => $patron,
>     findborrower      => $findborrower,
>-    borrower          => $patron_info,
>-    borrowernumber    => $borrowernumber,
>-    branch            => $branch,
>-    categoryname      => $patron_info->{description},
>+    branch            => $branch, # FIXME This is confusing
>     RoutingSerials    => C4::Context->preference('RoutingSerials'),
> );
> 
>diff --git a/members/statistics.pl b/members/statistics.pl
>index 957c9af437..10c9731755 100755
>--- a/members/statistics.pl
>+++ b/members/statistics.pl
>@@ -52,16 +52,7 @@ my $patron         = Koha::Patrons->find( $borrowernumber );
> output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
> my $category = $patron->category;
>-my $borrower= $patron->unblessed;
>-$borrower->{description} = $category->description;
>-$borrower->{category_type} = $category->category_type;
> 
>-foreach my $key ( keys %$borrower ) {
>-    $template->param( $key => $borrower->{$key} );
>-}
>-$template->param(
>-    categoryname    => $borrower->{'description'},
>-);
> # Construct column names
> my $fields = C4::Members::Statistics::get_fields();
> our @statistic_column_names = split '\|', $fields;
>@@ -95,11 +86,10 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
> 
> $template->param( picture => 1 ) if $patron->image;
> 
>-$template->param(%$borrower);
>-
>-$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
>+$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
> 
> $template->param(
>+    patron             => $patron,
>     statisticsview     => 1,
>     datas              => $datas,
>     column_names       => \@statistic_column_names,
>diff --git a/members/summary-print.pl b/members/summary-print.pl
>index 1981a494c4..36604113f6 100755
>--- a/members/summary-print.pl
>+++ b/members/summary-print.pl
>@@ -47,11 +47,6 @@ my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in"
> my $patron         = Koha::Patrons->find( $borrowernumber );
> output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
> 
>-my $category = $patron->category;
>-my $data = $patron->unblessed;
>-$data->{description} = $category->description;
>-$data->{category_type} = $category->category_type;
>-
> my ( $total, $accts, $numaccts ) = GetMemberAccountRecords($borrowernumber);
> foreach my $accountline (@$accts) {
>     if (   $accountline->{accounttype} ne 'F'
>@@ -68,9 +63,7 @@ my $holds_rs = Koha::Holds->search(
> );
> 
> $template->param(
>-    %$data,
>-
>-    borrowernumber => $borrowernumber,
>+    patron => $patron,
> 
>     accounts => $accts,
>     totaldue => $total,
>diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
>index a56ed6a96b..6a9aff483c 100755
>--- a/opac/opac-detail.pl
>+++ b/opac/opac-detail.pl
>@@ -840,17 +840,12 @@ if ( C4::Context->preference('reviewson') ) {
>         }
>     }
>     for my $review (@$reviews) {
>-        my $patron = Koha::Patrons->find( $review->{borrowernumber} );
>+        my $patron = Koha::Patrons->find( $review->{borrowernumber} ); # FIXME Should be Koha::Review->reviewer or similar
> 
>-        # setting some borrower info into this hash
>-        $review->{title}     = $patron->title;
>-        $review->{surname}   = $patron->surname;
>-        $review->{firstname} = $patron->firstname;
>+        $review->{patron} = $patron;
>         if ( $libravatar_enabled and $patron->email ) {
>             $review->{avatarurl} = libravatar_url( email => $patron->email, https => $ENV{HTTPS} );
>         }
>-        $review->{userid}     = $patron->userid;
>-        $review->{cardnumber} = $patron->cardnumber;
> 
>         if ( $patron->borrowernumber eq $borrowernumber ) {
>             $review->{your_comment} = 1;
>diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
>index a37de20a1d..a0af3ebd71 100755
>--- a/opac/opac-reserve.pl
>+++ b/opac/opac-reserve.pl
>@@ -478,12 +478,8 @@ foreach my $biblioNum (@biblionumbers) {
>         my $holds = $item->current_holds;
> 
>         if ( my $first_hold = $holds->next ) {
>-            my $patron = Koha::Patrons->find( $first_hold->borrowernumber );
>             $itemLoopIter->{backgroundcolor} = 'reserved';
>             $itemLoopIter->{reservedate}     = output_pref({ dt => dt_from_string($first_hold->reservedate), dateonly => 1 }); # FIXME Should be formatted in the template
>-            $itemLoopIter->{ReservedForBorrowernumber} = $first_hold->borrowernumber;
>-            $itemLoopIter->{ReservedForSurname}        = $patron->surname;
>-            $itemLoopIter->{ReservedForFirstname}      = $patron->firstname;
>             $itemLoopIter->{ExpectedAtLibrary}         = $first_hold->branchcode;
>             $itemLoopIter->{waitingdate} = $first_hold->waitingdate;
>         }
>diff --git a/reserve/request.pl b/reserve/request.pl
>index e287a0faf4..1a9e076484 100755
>--- a/reserve/request.pl
>+++ b/reserve/request.pl
>@@ -176,25 +176,11 @@ if ($borrowernumber_hold && !$action) {
>         $diffbranch = 1;
>     }
> 
>-    my $is_debarred = $patron->is_debarred;
>     $template->param(
>-                borrowernumber      => $patron->borrowernumber,
>-                borrowersurname     => $patron->surname,
>-                borrowerfirstname   => $patron->firstname,
>-                borrowerstreetaddress   => $patron->address,
>-                borrowercity        => $patron->city,
>-                borrowerphone       => $patron->phone,
>-                borrowermobile      => $patron->mobile,
>-                borrowerfax         => $patron->fax,
>-                borrowerphonepro    => $patron->phonepro,
>-                borroweremail       => $patron->email,
>-                borroweremailpro    => $patron->emailpro,
>-                cardnumber          => $patron->cardnumber,
>                 expiry              => $expiry,
>                 diffbranch          => $diffbranch,
>                 messages            => $messages,
>                 warnings            => $warnings,
>-                restricted          => $is_debarred,
>                 amount_outstanding  => GetMemberAccountRecords($patron->borrowernumber),
>     );
> }
>@@ -400,9 +386,7 @@ foreach my $biblionumber (@biblionumbers) {
> 
>                 $item->{backgroundcolor} = 'reserved';
>                 $item->{reservedate}     = output_pref({ dt => dt_from_string( $first_hold->reservedate ), dateonly => 1 }); # FIXME Should be formatted in the template
>-                $item->{ReservedForBorrowernumber}     = $p->borrowernumber;
>-                $item->{ReservedForSurname}     = $p->surname;
>-                $item->{ReservedForFirstname}     = $p->firstname;
>+                $item->{ReservedFor}     = $p;
>                 $item->{ExpectedAtLibrary}     = $first_hold->branchcode;
>                 $item->{waitingdate} = $first_hold->waitingdate;
>             }
>@@ -610,9 +594,6 @@ foreach my $biblionumber (@biblionumbers) {
>                      holdsview => 1,
>                      C4::Search::enabled_staff_search_views,
>                     );
>-    if ( $patron ) {
>-        $template->param( borrower_branchcode => $patron->branchcode );
>-    }
> 
>     $biblioloopiter{biblionumber} = $biblionumber;
>     $biblioloopiter{title} = $dat->{title};
>@@ -640,6 +621,7 @@ if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) {
> }
> 
> $template->param(
>+    patron => $patron,
>     SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
>     AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
> );
>diff --git a/reviews/reviewswaiting.pl b/reviews/reviewswaiting.pl
>index ae30c7827a..6c0aa763e6 100755
>--- a/reviews/reviewswaiting.pl
>+++ b/reviews/reviewswaiting.pl
>@@ -70,10 +70,8 @@ foreach ( @$reviews ) {
>     my $borrowernumber = $_->{borrowernumber};
>     my $patron = Koha::Patrons->find( $borrowernumber);
>     my $biblioData     = GetBiblioData($_->{biblionumber});
>-    # setting some borrower info into this hash
>     $_->{bibliotitle} = $biblioData->{'title'};
>-    $_->{surname}     = $patron->surname;
>-    $_->{firstname}   = $patron->firstname;
>+    $_->{patron}      = $patron;
> }
> 
> my $url = "/cgi-bin/koha/reviews/reviewswaiting.pl?status=$status";
>diff --git a/tools/viewlog.pl b/tools/viewlog.pl
>index 9af64d5fb6..ee70ba52fd 100755
>--- a/tools/viewlog.pl
>+++ b/tools/viewlog.pl
>@@ -116,10 +116,6 @@ if ($do_it) {
>         $result->{'biblionumber'}      = q{};
>         $result->{'biblioitemnumber'}  = q{};
>         $result->{'barcode'}           = q{};
>-        $result->{'userfirstname'}     = q{};
>-        $result->{'usersurname'}       = q{};
>-        $result->{'borrowerfirstname'} = q{};
>-        $result->{'borrowersurname'}   = q{};
> 
>         if ( substr( $result->{'info'}, 0, 4 ) eq 'item' || $result->{module} eq "CIRCULATION" ) {
> 
>@@ -138,8 +134,7 @@ if ($do_it) {
>         if ( $result->{'user'} ) {
>             my $patron = Koha::Patrons->find( $result->{'user'} );
>             if ($patron) {
>-                $result->{'userfirstname'} = $patron->firstname;
>-                $result->{'usersurname'}   = $patron->surname;
>+                $result->{librarian} = $patron;
>             }
>         }
> 
>@@ -148,8 +143,7 @@ if ($do_it) {
>             if ( $result->{'object'} ) {
>                 my $patron = Koha::Patrons->find( $result->{'object'} );
>                 if ($patron) {
>-                    $result->{'borrowerfirstname'} = $patron->firstname;
>-                    $result->{'borrowersurname'}   = $patron->surname;
>+                    $result->{patron} = $patron;
>                 }
>             }
>         }
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 18789: 64211 | 64212 | 64213 | 64214 | 64215 | 64216 | 64218 | 64219 | 64221 | 64229 | 71301 | 71302 | 71303 | 71304 | 71305 | 71306 | 71307 | 71308 | 71309 | 71310 | 71311 | 71485 | 71486 | 71487 | 71488 | 71489 | 71490 | 71491 | 71492 | 71493 | 71494 | 71495 | 71496 | 71679 | 71680 | 71681 | 71682 | 71683 | 71684 | 71685 | 71686 | 71687 | 71688 | 71689 | 71690 | 71691 | 71713 | 71714 | 71715 | 71716 | 71717 | 71718 | 71719 | 71720 | 71721 | 71722 | 71723 | 71724 | 71725 | 71726 | 71727 | 71728 | 71729 | 71730 | 71731 | 71732 | 71733 | 71734 | 71735 | 71736 | 71827 | 71838 | 71841 | 73293 | 73890 | 75237