From 66ecfe5b35c45292df8ddfa1862e1067d9f3630f Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Tue, 8 Apr 2003 11:43:44 +0000
Subject: [PATCH] see #265

---
 insertdata.pl                                             | 8 +++-----
 .../intranet-tmpl/default/en/members/moremember.tmpl      | 2 +-
 koha-tmpl/intranet-tmpl/default/en/newmember.tmpl         | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/insertdata.pl b/insertdata.pl
index 81bce7b099..1dc516aded 100755
--- a/insertdata.pl
+++ b/insertdata.pl
@@ -31,8 +31,6 @@ use C4::Date;
 use strict;
 
 my $input= new CGI;
-#print $input->header;
-#print $input->dump;
 
 #get all the data into a hash
 my @names=$input->param;
@@ -62,7 +60,7 @@ if (my $data=$sth->fetchrow_hashref){
   categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
   borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
   initials='$data{'initials'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',
-  gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',textmessaging='$data{'textmessaging'}'
+  gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',textmessaging='$data{'textmessaging'}', branchcode = '$data{'branchcode'}'
   where borrowernumber=$data{'borrowernumber'}";
 #  print $query;
 
@@ -72,13 +70,13 @@ if (my $data=$sth->fetchrow_hashref){
   $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
   firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity,
   altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
-  initials,ethnicity,borrowernumber,physstreet) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
+  initials,ethnicity,borrowernumber,physstreet,branchcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
   '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
   '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}',
   '$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
   '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}',
   '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}',
-  '$data{'ethnicity'}','$data{'borrowernumber'}','$data{'streetaddress'}')";
+  '$data{'ethnicity'}','$data{'borrowernumber'}','$data{'streetaddress'}','$data{'branchcode'}')";
 }
 # ok if its an adult (type) it may have borrowers that depend on it as a guarantor
 # so when we update information for an adult we should check for guarantees and update the relevant part
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index 6e071f460e..8bcb18a076 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -36,7 +36,7 @@
 		Area: <TMPL_VAR NAME="area"><BR>
 		Fee:$30/year, Paid<BR>
 		Joined: <TMPL_VAR NAME="dateenrolled">,  Expires: <TMPL_VAR NAME="expiry"><BR>
-		Joining Branch: <TMPL_VAR NAME="homebranch"><P>
+		Joining Branch: <TMPL_VAR NAME="branchcode"><P>
 		<TMPL_IF NAME="printethnicityline">
 			Ethnicity: <TMPL_VAR NAME="ethnicity">, <TMPL_VAR NAME="ethnotes"><br>
 		</TMPL_IF>
diff --git a/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl b/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
index cf56942c0c..2a416991a1 100644
--- a/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
@@ -82,7 +82,7 @@
 				<B>Joining Branch</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="joinbranch">
+				<TMPL_VAR Name="branchcode">
 			</td>
 		</tr>
 		<tr valign=top bgcolor="<TMPL_VAR Name="main">" >
-- 
2.39.5