Merge remote-tracking branch 'kc/new/bug_6094' into kcmaster

[koha.git] / members / boraccount.pl

diff --git a/members/boraccount.pl b/members/boraccount.pl
index b91684a..e16405b 100755 (executable)
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -32,6 +32,7 @@ use CGI;
 use C4::Members;
 use C4::Branch;
 use C4::Accounts;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 
 my $input=new CGI;
 
@@ -87,9 +88,6 @@ foreach my $accountline ( @{$accts}) {
         $accountline->{payment} = 1;
         $reverse_col = 1;
     }
-    if ($accountline->{accounttype} ne 'F' && $accountline->{accounttype} ne 'FU'){
-        $accountline->{printtitle} = 1;
-    }
 }
 
 $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
@@ -97,6 +95,14 @@ $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
 my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
 $template->param( picture => 1 ) if $picture;
 
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    my $attributes = GetBorrowerAttributes($borrowernumber);
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
+}
+
 $template->param(
     finesview           => 1,
     firstname           => $data->{'firstname'},
@@ -120,6 +126,7 @@ $template->param(
     totalcredit         => $totalcredit,
     is_child            => ($data->{'category_type'} eq 'C'),
     reverse_col         => $reverse_col,
-    accounts            => $accts );
+    accounts            => $accts,
+);
 
 output_html_with_http_headers $input, $cookie, $template->output;