X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fboraccount.pl;h=518aa3c01da2243091a72d7f6ca55fd76213841f;hb=de03c263f0579d28a735e3b1261121e439263a82;hp=b91684a3db3ee9d56a677a2224a329fa13b95782;hpb=c1181b780bb87ae688d15070001ce9b949c35070;p=koha_fer

diff --git a/members/boraccount.pl b/members/boraccount.pl
index b91684a3db..518aa3c01d 100755
--- 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;
 
@@ -41,7 +42,7 @@ my ($template, $loggedinuser, $cookie)
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {borrowers => 1, updatecharges => 1},
+                            flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},
                             debug => 1,
                             });
 
@@ -52,7 +53,7 @@ my $action = $input->param('action') || '';
 my $data=GetMember('borrowernumber' => $borrowernumber);
 
 if ( $action eq 'reverse' ) {
-  ReversePayment( $borrowernumber, $input->param('accountno') );
+  ReversePayment( $input->param('accountlines_id') );
 }
 
 if ( $data->{'category_type'} eq 'C') {
@@ -83,29 +84,35 @@ foreach my $accountline ( @{$accts}) {
     $accountline->{date} = format_date($accountline->{date});
     $accountline->{amount} = sprintf '%.2f', $accountline->{amount};
     $accountline->{amountoutstanding} = sprintf '%.2f', $accountline->{amountoutstanding};
-    if ($accountline->{accounttype} eq 'Pay') {
+    if ($accountline->{accounttype} =~ /^Pay/) {
         $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' );
 
-my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
 $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'},
     surname             => $data->{'surname'},
+    othernames          => $data->{'othernames'},
     borrowernumber      => $borrowernumber,
     cardnumber          => $data->{'cardnumber'},
     categorycode        => $data->{'categorycode'},
     category_type       => $data->{'category_type'},
-    categoryname		 => $data->{'description'},
+    categoryname		=> $data->{'description'},
     address             => $data->{'address'},
     address2            => $data->{'address2'},
     city                => $data->{'city'},
@@ -120,6 +127,9 @@ $template->param(
     totalcredit         => $totalcredit,
     is_child            => ($data->{'category_type'} eq 'C'),
     reverse_col         => $reverse_col,
-    accounts            => $accts );
+    accounts            => $accts,
+	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+    RoutingSerials => C4::Context->preference('RoutingSerials'),
+);
 
 output_html_with_http_headers $input, $cookie, $template->output;