X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmoremember.pl;h=bb593c4586baa660181d25f7b6d38b98245b0346;hb=528cfd918c2f8f57a392302897977804c5f7e7c8;hp=aa8165b09ff76868a12214147058a373eef38ea2;hpb=826eda9d7045e970e6989fef7feb5f013e81e675;p=koha.git

diff --git a/members/moremember.pl b/members/moremember.pl
index aa8165b09f..bb593c4586 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -155,7 +156,7 @@ $data->{ "sex_".$data->{'sex'}."_p" } = 1;
 
 my $catcode;
 if ( $category_type eq 'C') {
-	if ($data->{'guarantorid'} ne '0' ) {
+	if ($data->{guarantorid} ) {
     	my $data2 = GetMember( 'borrowernumber' => $data->{'guarantorid'} );
     	foreach (qw(address city B_address B_city phone mobile zipcode country B_country)) {
     	    $data->{$_} = $data2->{$_};
@@ -222,8 +223,7 @@ if ( C4::Context->preference("IndependantBranches") ) {
     $samebranch = 1;
 }
 my $branchdetail = GetBranchDetail( $data->{'branchcode'});
-$data->{'branchname'} = $branchdetail->{branchname};
-
+@{$data}{keys %$branchdetail} = values %$branchdetail; # merge in all branch columns
 
 my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
 my $lib1 = &GetSortDetails( "Bsort1", $data->{'sort1'} );
@@ -231,6 +231,12 @@ my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} );
 $template->param( lib1 => $lib1 ) if ($lib1);
 $template->param( lib2 => $lib2 ) if ($lib2);
 
+# Show OPAC privacy preference is system preference is set
+if ( C4::Context->preference('OPACPrivacy') ) {
+    $template->param( OPACPrivacy => 1);
+    $template->param( "privacy".$data->{'privacy'} => 1);
+}
+
 # current issues
 #
 my $issue = GetPendingIssues($borrowernumber);
@@ -427,6 +433,7 @@ $template->param(
     categoryname    => $data->{'description'},
     reregistration  => $reregistration,
     branch          => $branch,
+    todaysdate      => C4::Dates->today(),
     totalprice      => sprintf("%.2f", $totalprice),
     totaldue        => sprintf("%.2f", $total),
     totaldue_raw    => $total,