From afa2f8f7abdd8f26190b656fb3cbaa7f015fbeb3 Mon Sep 17 00:00:00 2001
From: David Roberts <david.roberts@ptfs-europe.com>
Date: Mon, 30 Jun 2014 12:22:46 +0100
Subject: [PATCH] Bug 12495 Include streetnumber in hold alert address

Steetnumber is not included in the addess in the hold alert
add the field to those displayed
---
 circ/returns.pl                                         | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/circ/returns.pl b/circ/returns.pl
index a95a17c..428edb1 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -384,6 +384,7 @@ if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {
             wbortitle       => $borr->{'title'},
             wborphone       => $borr->{'phone'},
             wboremail       => $borr->{'email'},
+            wborstnum       => $borr->{streetnumber},
             wboraddress     => $borr->{'address'},
             wboraddress2    => $borr->{'address2'},
             wborcity        => $borr->{'city'},
@@ -429,6 +430,7 @@ if ( $messages->{'ResFound'}) {
             boremail       => $borr->{'email'},
             boraddress     => $borr->{'address'},
             boraddress2    => $borr->{'address2'},
+            borstnum       => $borr->{streetnumber},
             borcity        => $borr->{'city'},
             borzip         => $borr->{'zipcode'},
             borcnum        => $borr->{'cardnumber'},
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 72f9ee3..41e057d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -149,7 +149,7 @@ $(document).ready(function () {
 [% IF ( wborcnum ) %]<h5>Hold for:</h5>
         <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
             [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
-        <li>[% wboraddress %][% IF ( wboraddress2 ) %]<br />
+        <li>[% wborstnum %] [% wboraddress %][% IF ( wboraddress2 ) %]<br />
 		[% wboraddress2 %]<br />[% END %]
         [% wborcity %]  [% wborzip %]</li>
         [% IF ( wborphone ) %]<li>[% wborphone %]</li>[% END %]
@@ -182,7 +182,7 @@ $(document).ready(function () {
         <h4>Hold for:</h4>
 			<ul>
             <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
-            <li>[% boraddress %]<br />
+            <li>[% borstnum %] [% boraddress %]<br />
 			[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
             [% borcity %] [% borzip %]</li>
            [% IF ( borphone ) %]<li> [% borphone %]</li>[% END %]
@@ -223,7 +223,7 @@ $(document).ready(function () {
                 <h4>Hold for: </h4>
                     <ul>
                         <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
-                        <li>[% boraddress %]<br />
+                        <li>[% borstnum %] [% boraddress %]<br />
 						[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
 						[% borcity %]  [% borzip %]</li>
                         [% IF ( borphone ) %]<li>[% borphone %]</li>[% END %]
@@ -331,7 +331,7 @@ $(document).ready(function () {
             <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
                 [% borsurname %], [% borfirstname %]
             </a> ([% borcnum %])</li>
-            <li>[% boraddress %]<br />
+            <li>[% borstnum %] [% boraddress %]<br />
 			[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
 			[% borcity %] [% borzip %]</li>
             [% IF ( borphone ) %]<li>[% borphone %]</li>[% END %]
-- 
1.9.3