Merge branch 'bug_9367' into 3.12-master

[koha.git] / members / maninvoice.pl

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 9a040b6..f1c572c 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -106,8 +106,14 @@ if ($add){
     $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
     my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
     $template->param( picture => 1 ) if $picture;
-    my $attributes = GetBorrowerAttributes($borrowernumber);
 
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    my $attributes = GetBorrowerAttributes($borrowernumber);
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
+}
        $template->param(
                 borrowernumber => $borrowernumber,
                firstname => $data->{'firstname'},
@@ -127,7 +133,7 @@ if ($add){
                branchcode => $data->{'branchcode'},
                branchname => GetBranchName($data->{'branchcode'}),
                is_child        => ($data->{'category_type'} eq 'C'),
-        extendedattributes => $attributes,
+               activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
     );
     output_html_with_http_headers $input, $cookie, $template->output;
 }