X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-account.pl;h=c3cb9b420255754b9b29416e42043e9a544667e8;hb=568f32606c2c9c247b2b477193a2d6814f738fa6;hp=6136735766978c4a6c0538c41f25052308577a9f;hpb=0b66bd800d9c5137240e48c2821a6871427d169d;p=koha.git

diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index 6136735766..c3cb9b4202 100755
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -1,5 +1,8 @@
 #!/usr/bin/perl
 
+# Copyright Katipo Communications 2002
+# Copyright Biblibre 2007,2010
+#
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
@@ -11,22 +14,18 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# wrriten 15/10/2002 by finlay@katipo.oc.nz
-# script to display borrowers account details in the opac
 
 use strict;
-use C4::Output;
 use CGI;
 use C4::Members;
 use C4::Circulation;
 use C4::Auth;
-use C4::Interface::CGI::Output;
-
-use C4::Date;
+use C4::Output;
+use warnings;
 
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -42,31 +41,24 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 
 # get borrower information ....
 my $borr = GetMemberDetails( $borrowernumber );
-
 my @bordat;
 $bordat[0] = $borr;
 
 $template->param( BORROWER_INFO => \@bordat );
 
 #get account details
-my ( $total , $accts, $numaccts) = GetBorrowerAcctRecord( $borrowernumber );
+my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
 
 for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
-    $accts->[$i]{'date'} = format_date( $accts->[$i]{'date'} );
-    $accts->[$i]{'amount'} = sprintf( "%.2f", $accts->[$i]{'amount'} );
+    $accts->[$i]{'amount'} = sprintf( "%.2f", $accts->[$i]{'amount'} || '0.00');
     if ( $accts->[$i]{'amount'} >= 0 ) {
         $accts->[$i]{'amountcredit'} = 1;
     }
     $accts->[$i]{'amountoutstanding'} =
-      sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} );
+      sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} || '0.00' );
     if ( $accts->[$i]{'amountoutstanding'} >= 0 ) {
         $accts->[$i]{'amountoutstandingcredit'} = 1;
     }
-    if (   $accts->[$i]{'accounttype'} ne 'F'
-        && $accts->[$i]{'accounttype'} ne 'FU' )
-    {
-        $accts->[$i]{'print_title'};
-    }
 }
 
 # add the row parity
@@ -79,7 +71,8 @@ foreach my $row (@$accts) {
 
 $template->param (
     ACCOUNT_LINES => $accts,
-    total => sprintf( "%.2f", $total )
+    total => sprintf( "%.2f", $total ),
+	accountview => 1
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;