[Koha-cvs] koha circ/circulation.pl koha-tmpl/intranet-tmp... [dev_week]

[Kyle Hall]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Kyle Hall <kylemhall>	07/08/16 16:14:57

Modified files:
	circ           : circulation.pl 
	koha-tmpl/intranet-tmpl/ccfls/en/circ: circulation.tmpl 

Log message:
	Added the zip code to the borrowers address as it appears on circulation.pl for ccfls templates.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.81.2.14.2.22&r2=1.81.2.14.2.23
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.17&r2=1.1.2.1.2.18

Patches:
Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.81.2.14.2.22
retrieving revision 1.81.2.14.2.23
diff -u -b -r1.81.2.14.2.22 -r1.81.2.14.2.23
--- circ/circulation.pl	18 May 2007 14:22:35 -0000	1.81.2.14.2.22
+++ circ/circulation.pl	16 Aug 2007 16:14:56 -0000	1.81.2.14.2.23
@@ -392,6 +392,7 @@
 		expiry => $borrower->{'expiry'}, #format_date($borrower->{'expiry'}),
 		categorycode => $borrower->{'categorycode'},
 		streetaddress => $borrower->{'streetaddress'},
+                zipcode => $borrower->{'zipcode'},
 		emailaddress => $borrower->{'emailaddress'},
 		borrowernotes => $borrower->{'borrowernotes'},
 		city => $borrower->{'city'},

Index: koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/Attic/circulation.tmpl,v
retrieving revision 1.1.2.1.2.17
retrieving revision 1.1.2.1.2.18
diff -u -b -r1.1.2.1.2.17 -r1.1.2.1.2.18
--- koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl	15 Aug 2007 15:52:29 -0000	1.1.2.1.2.17
+++ koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl	16 Aug 2007 16:14:57 -0000	1.1.2.1.2.18
@@ -156,7 +156,7 @@
 	<div id="notes">
 	<!-- TMPL_IF NAME="patronimages" --><img src="/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR NAME="patronimages" -->" alt="" border="0" /><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
 	<ul>
-	<li><!-- TMPL_VAR NAME="streetaddress" --><br /> <!-- TMPL_VAR NAME="city" --></li>
+	<li><!-- TMPL_VAR NAME="streetaddress" --><br /> <!-- TMPL_VAR NAME="city" --> <!-- TMPL_VAR NAME="zipcode" --></li>
 	<li><!-- TMPL_VAR NAME="phone" --></li>
 	<!-- TMPL_IF NAME="emailaddress" --><li><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a></li><!-- /TMPL_IF -->
 	<li>Category: <!-- TMPL_VAR name="categorycode" --></li>