From 0269200bc6c6615e405ac34eee36852434c08dca Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 23 Apr 2018 14:23:00 -0400 Subject: [PATCH] Bug 2696: (QA follow-up) Fix POD, results sorting, permissions Signed-off-by: Jonathan Druart --- Koha/Account/Offset.pm | 10 +++++++++- .../prog/en/modules/members/accountline-details.tt | 2 +- members/accountline-details.pl | 9 ++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Koha/Account/Offset.pm b/Koha/Account/Offset.pm index 3110d6a52b..f456d16545 100644 --- a/Koha/Account/Offset.pm +++ b/Koha/Account/Offset.pm @@ -20,7 +20,7 @@ use Modern::Perl; use Carp; use Koha::Database; -use Koha::Account::Line; +use Koha::Account::Lines; use base qw(Koha::Object); @@ -38,6 +38,10 @@ Account offsets are used to track the changes in account lines =head3 debit +my $debit = $account_offset->debit; + +Returns the related accountline that increased the amount owed by the patron. + =cut sub debit { @@ -49,6 +53,10 @@ sub debit { =head3 credit +my $credit = $account_offset->credit; + +Returns the related accountline that decreased the amount owed by the patron. + =cut sub credit { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt index aaaa78c871..a1085edb5d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -94,7 +94,7 @@ - [% FOREACH ao IN account_offsets.sort('created_on') %] + [% FOREACH ao IN account_offsets %] [% IF type == 'credit' %] [% SET offset_accountline = ao.debit %] [% ELSIF type == 'debit' %] diff --git a/members/accountline-details.pl b/members/accountline-details.pl index 856516c48e..1ac40a0210 100644 --- a/members/accountline-details.pl +++ b/members/accountline-details.pl @@ -35,7 +35,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( type => "intranet", authnotrequired => 0, flagsrequired => { - borrowers => 1, + borrowers => 'edit_borrowers', updatecharges => 'remaining_permissions' }, } @@ -49,12 +49,15 @@ if ($accountline) { my $type = $accountline->amount < 0 ? 'credit' : 'debit'; my $column = $type eq 'credit' ? 'credit_id' : 'debit_id'; - my @account_offsets = Koha::Account::Offsets->search( { $column => $accountlines_id } ); + my $account_offsets = Koha::Account::Offsets->search( + { $column => $accountlines_id }, + { order_by => 'created_on' }, + ); $template->param( type => $type, accountline => $accountline, - account_offsets => \@account_offsets, + account_offsets => $account_offsets, finesview => 1, ); -- 2.39.5