---
members/memberentry.pl | 10 +++++-----
members/moremember.pl | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/members/memberentry.pl b/members/memberentry.pl
index b3582f3..1508af6 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -167,11 +167,11 @@ if (defined($guarantorid) and ($category_type eq 'C' ||
$category_type eq 'P') a
my $guarantordata=GetMember($guarantorid);
$guarantorinfo=$guarantordata->{'surname'}." ,
".$guarantordata->{'firstname'};
if (!defined($data{'contactname'}) or $data{'contactname'} eq '' or
$data{'contactname'} ne $guarantordata->{'surname'}) {
- $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 branchcode)) {
- $data{$_} = $guarantordata->{$_};
+ $newdata{'contactfirstname'}= $guarantordata->{'firstname'};
+ $newdata{'contactname'} = $guarantordata->{'surname'};
+ $newdata{'contacttitle'} = $guarantordata->{'title'};
+ foreach (qw(streetnumber streettype address address2 zipcode city
phone phonepro mobile fax email emailpro branchcode)) {
+ $newdata{$_} = $guarantordata->{$_} if not defined $newdata{$_};
}
}
}
diff --git a/members/moremember.pl b/members/moremember.pl
index 151f9c2..5c79747 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -136,8 +136,8 @@ my $catcode;
if ( $category_type eq 'C') {
if ($data->{'guarantorid'} ne '0' ) {
my $data2 = GetMember( $data->{'guarantorid'} ,'borrowernumber');
- foreach (qw(address city B_address B_city phone mobile zipcode)) {
- $data->{$_} = $data2->{$_};
+ foreach (qw(address address2 city B_address B_city phone mobile
zipcode)) {
+ $data->{$_} = $data2->{$_} if not defined $data->{$_};
}
}
my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE
category_type = ?' );
--
1.5.6.5
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
