X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=members%2Fprintfeercpt.pl;h=26d40575d726d5d91d68fe7f3b9a23655d552023;hb=3d7600f97659ba3fda31dfff2656433e6b20c0ef;hp=59d5cb39ef910b8338245543cdabe918976422e0;hpb=03890c90ac41f66b2de04d0280e2e96a0d2e8be8;p=koha.git

diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index 59d5cb39ef..26d40575d7 100755
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -9,45 +9,45 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
 
 use C4::Auth;
 use C4::Output;
-use C4::Dates qw/format_date/;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Members;
 use C4::Branch;
 use C4::Accounts;
+use Koha::DateUtils;
 
 my $input=new CGI;
 
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/printfeercpt.tmpl",
+    = get_template_and_user({template_name => "members/printfeercpt.tt",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {borrowers => 1, updatecharges => 1},
+                            flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},
                             debug => 1,
                             });
 
 my $borrowernumber=$input->param('borrowernumber');
 my $action = $input->param('action') || '';
-my $accountno = $input->param('accountno');
+my $accountlines_id = $input->param('accountlines_id');
 
 #get borrower details
 my $data=GetMember('borrowernumber' => $borrowernumber);
@@ -73,7 +73,7 @@ my @accountrows; # this is for the tmpl-loop
 
 my $toggle;
 for (my $i=0;$i<$numaccts;$i++){
-   next if ($accts->[$i]{'accountno'} ne $accountno);
+    next if ( $accts->[$i]{'accountlines_id'} ne $accountlines_id );
     if($i%2){
             $toggle = 0;
     } else {
@@ -89,7 +89,8 @@ for (my $i=0;$i<$numaccts;$i++){
     if($accts->[$i]{'amountoutstanding'} <= 0){
         $accts->[$i]{'amountoutstandingcredit'} = 1;
     }
-    my %row = ( 'date'              => format_date($accts->[$i]{'date'}),
+
+    my %row = ( 'date'         => dt_from_string( $accts->[$i]{'date'} ),
                 'amountcredit' => $accts->[$i]{'amountcredit'},
                 'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
                 'toggle' => $accts->[$i]{'toggle'},
@@ -99,8 +100,7 @@ for (my $i=0;$i<$numaccts;$i++){
                 'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
                 'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
                 'accountno' => $accts->[$i]{'accountno'},
-                'payment' => ( $accts->[$i]{'accounttype'} eq 'Pay' ),
-
+                accounttype => $accts->[$i]{accounttype},
                 );
 
     if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
@@ -113,7 +113,7 @@ for (my $i=0;$i<$numaccts;$i++){
 
 $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;
 
 $template->param(