From c8e13ff8342baeeac1298a7d6d0f5baf3992b381 Mon Sep 17 00:00:00 2001
From: Chris Cormack <crc@liblime.com>
Date: Wed, 26 Dec 2007 21:23:16 -0600
Subject: [PATCH] Fix for bug 1164, child branch not defaulting to guarantor's
 on add child

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/modules/members/memberentrygen.tmpl    | 14 +++++++-------
 members/memberentry.pl                             |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 45aec07631..758e85d7bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -458,7 +458,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 			    <!-- TMPL_IF NAME="mandatoryaltcontactfirstname" -->
 				<label for="altcontactfirstname" class="required">
 				<!-- TMPL_ELSE -->
-				<label for "altcontactfirstname">
+				<label for="altcontactfirstname">
 				<!-- /TMPL_IF -->
 				Firstname:</label>
 				<input type="text" name="altcontactfirstname" value="<!-- TMPL_VAR NAME="altcontactfirstname" -->">
@@ -468,7 +468,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 			    <!-- TMPL_IF NAME="mandatoryaltcontactsurname" -->
 				<label for="altcontactsurname" class="required">
 				<!-- TMPL_ELSE -->
-				<label for "altcontactsurname">
+				<label for="altcontactsurname">
 				<!-- /TMPL_IF -->
 				Surname:</label>
 				<input type="text" name="altcontactsurname" value="<!-- TMPL_VAR NAME="altcontactsurname" -->">
@@ -478,7 +478,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 			    <!-- TMPL_IF NAME="mandatoryaltcontactaddress1" -->
 				<label for="altcontactaddress1" class="required">
 				<!-- TMPL_ELSE -->
-				<label for "altcontactaddress1">
+				<label for="altcontactaddress1">
 				<!-- /TMPL_IF -->
 				Address line 1:</label>
 				<input type="text" name="altcontactaddress1" value="<!-- TMPL_VAR NAME="altcontactaddress1" -->" size="40">
@@ -488,7 +488,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 			    <!-- TMPL_IF NAME="mandatoryaltcontactaddress2" -->
 				<label for="altcontactaddress2" class="required">
 				<!-- TMPL_ELSE -->
-				<label for "altcontactaddress2">
+				<label for="altcontactaddress2">
 				<!-- /TMPL_IF -->
 				Address line 2:</label>
 				<input type="text" name="altcontactaddress2" value="<!-- TMPL_VAR NAME="altcontactaddress2" -->" size="40">
@@ -498,7 +498,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 			    <!-- TMPL_IF NAME="mandatoryaltcontactaddress3" -->
 				<label for="altcontactaddress3" class="required">
 				<!-- TMPL_ELSE -->
-				<label for "altcontactaddress3">
+				<label for="altcontactaddress3">
 				<!-- /TMPL_IF -->
 				City, State:</label>
 				<input type="text" name="altcontactaddress3" value="<!-- TMPL_VAR NAME="altcontactaddress3" -->" size="40">
@@ -508,7 +508,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 			    <!-- TMPL_IF NAME="mandatoryaltcontactzipcode" -->
 				<label for="altcontactzipcode" class="required">
 				<!-- TMPL_ELSE -->
-				<label for "altcontactzipcode">
+				<label for="altcontactzipcode">
 				<!-- /TMPL_IF -->
 				ZIP/Post code:</label>
 				<input type="text" name="altcontactzipcode" value="<!-- TMPL_VAR NAME="altcontactzipcode" -->" size="5">
@@ -518,7 +518,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 			    <!-- TMPL_IF NAME="mandatoryaltcontactphone" -->
 				<label for="altcontactphone" class="required">
 				<!-- TMPL_ELSE -->
-				<label for "altcontactphone">
+				<label for="altcontactphone">
 				<!-- /TMPL_IF -->
 				Phone:</label>
 				<input type="text" name="altcontactphone" value="<!-- TMPL_VAR NAME="altcontactphone" -->">
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 090342c889..a9a593c5c0 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -155,7 +155,7 @@ if (($category_type eq 'C' || $category_type eq 'P') and $guarantorid ne '' ){
     $data{'contactfirstname'}= $guarantordata->{'firstname'}; 
     $data{'contactname'}     = $guarantordata->{'surname'};
     $data{'contacttitle'}    = $guarantordata->{'title'};  
-	foreach (qw(streetnumber address streettype address2 zipcode city phone phonepro mobile fax email emailpro)) {
+	  foreach (qw(streetnumber address streettype address2 zipcode city phone phonepro mobile fax email emailpro branchcode)) {
 		$data{$_} = $guarantordata->{$_};
 	}
   }
@@ -407,7 +407,7 @@ foreach my $branch (sort keys %$branches) {
 # --------------------------------------------------------------------------------------------------------
   #in modify mod :default value from $CGIbranch comes from borrowers table
   #in add mod: default value come from branches table (ip correspendence)
-$default=$data{'branchcode'}  if ($op eq 'modify');
+$default=$data{'branchcode'}  if ($op eq 'modify' || ($op eq 'add' && $category_type eq 'C'));
 my $CGIbranch = CGI::scrolling_list(-id    => 'branchcode',
             -name   => 'branchcode',
             -values => \@select_branch,
-- 
2.39.2