Merge branch 'bug_9367' into 3.12-master

[koha.git] / members / maninvoice.pl

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index f804e52..f1c572c 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -32,6 +32,7 @@ use C4::Members;
 use C4::Accounts;
 use C4::Items;
 use C4::Branch;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 
 my $input=new CGI;
 
@@ -45,7 +46,10 @@ if ($add){
     if(checkauth($input)) {
         #  print $input->header;
         my $barcode=$input->param('barcode');
-        my $itemnum = GetItemnumberFromBarcode($barcode) if $barcode;
+        my $itemnum;
+        if ($barcode) {
+            $itemnum = GetItemnumberFromBarcode($barcode);
+        }
         my $desc=$input->param('desc');
         my $amount=$input->param('amount');
         my $type=$input->param('type');
@@ -103,6 +107,13 @@ if ($add){
     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(
                 borrowernumber => $borrowernumber,
                firstname => $data->{'firstname'},
@@ -122,6 +133,7 @@ if ($add){
                branchcode => $data->{'branchcode'},
                branchname => GetBranchName($data->{'branchcode'}),
                is_child        => ($data->{'category_type'} eq 'C'),
+               activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
     );
     output_html_with_http_headers $input, $cookie, $template->output;
 }