Merge remote branch 'kc/new/enh/bug_5489' into kcmaster

This commit is contained in:
Chris Cormack 2010-12-21 21:43:51 +13:00
commit 435e8996a3

View file

@ -194,7 +194,9 @@ sub AddReserve {
my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber); my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
my $biblio = GetBiblioData($biblionumber); my $biblio = GetBiblioData($biblionumber);
my $letter = C4::Letters::getletter( 'reserves', 'HOLDPLACED'); my $letter = C4::Letters::getletter( 'reserves', 'HOLDPLACED');
my $admin_email_address = C4::Context->preference('KohaAdminEmailAddress'); my $branchcode = $borrower->{branchcode};
my $branch_details = C4::Branch::GetBranchDetail($branchcode);
my $admin_email_address =$branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
my %keys = (%$borrower, %$biblio); my %keys = (%$borrower, %$biblio);
foreach my $key (keys %keys) { foreach my $key (keys %keys) {