$data->{'phone'}=$data2->{'phone'};
$data->{'phoneday'}=$data2->{'phoneday'};
}
+my $ethnicityline='';
+if ($data->{'ethnicity'} || $data->{'ethnotes'}) {
+ $ethnicityline="Ethnicity: $data->{'ethnicity'}, $data->{'ethnotes'}<br>";
+}
print <<printend
Postal Address: $data->{'streetaddress'}, $data->{'city'}<BR>
Home Address: $data->{'physstreet'}, $data->{'streetcity'}<BR>
Fee:$30/year, Paid<BR>
Joined: $data->{'dateenrolled'}, Expires: $data->{'expiry'} <BR>
Joining Branch: $data->{'homebranch'}<P>
-Ethnicity: $data->{'ethnicity'}, $data->{'ethnotes'}<BR>
+$ethnicityline
DoB: $data->{'dateofbirth'}<BR>
Sex: $data->{'sex'}<P>
$issue->[$i]{'barcode'}</a></td>
<TD>$issue->[$i]{'date_due'}</td>";
#find the charge for an item
- my ($charge,$itemtype)=calc_charges(\%env,$issue->[$i]{'itemnumber'},$bornum);
+ my ($charge,$itemtype)=calc_charges(undef,$issue->[$i]{'itemnumber'},$bornum);
print "<TD>$itemtype</td>";
print "<TD>$charge</td>";